Fixup on https://github.com/matrix-org/matrix-rust-sdk/pull/3995 #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hywan
commented
Oct 8, 2024
| @@ -127,8 +155,6 @@ impl StateMachine { | |||
| } | |||
| }; | |||
|
|
|||
| self.set(next_state.clone()); | |||
| @@ -97,9 +122,12 @@ impl StateMachine { | |||
| } | |||
|
|
|||
| Running => { | |||
| // We haven't sync for a while so we should go back to recovering | |||
| if self.last_sync_date.elapsed() > self.delay_before_recover { | |||
| // We haven't changed the state for a while, we go back to `Recovering` to avoid | |||
There was a problem hiding this comment.
Let's not talk about sync but rather about state update here. A sync happens in RoomListService, not here.
| pub(super) fn set(&self, state: State) { | ||
| self.current.set(state); | ||
| let mut last_state_update_time = self.last_state_update_time.lock().unwrap(); |
There was a problem hiding this comment.
That's one bug fix. Updating the state must reset last_state_update_time.
| /// The maximum time before considering the state as “too old”. | ||
| /// | ||
| /// To be used in coordination with `Self::last_state_update_time`. | ||
| state_lifespan: Duration, |
There was a problem hiding this comment.
I believe this naming conveys a better semantics.
Comment on lines
+335
to
+337
| state_machine.set(state_machine.next(sliding_sync).await?); | ||
| assert_eq!(state_machine.get(), State::Running); | ||
| } |
There was a problem hiding this comment.
Testing we are still in Running reveals one of the bug.
MatMaul
reviewed
Oct 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These patch fixes your
recoveringbranch. Once merged, please rebase all the commits, maybe in a single commit as there isn't too much code.Sorry for the messy commits, but it would be better if I could rebase with your branch 😉.
Instantis never updated!StateMachine::nextmust not update the state, it must just calculated the next one