Consolidate DownstairsClient::reinitialize
#1549
Merged
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
mkeeter
commented
Nov 1, 2024
| @@ -523,27 +515,19 @@ impl Downstairs { | |||
| // Specifically, we want to skip jobs if the only path back online for | |||
| // that client goes through live-repair; if that client can come back | |||
| // through replay, then the jobs must remain live. | |||
| let new_state = self.clients[client_id].state(); | |||
| if matches!(prev_state, DsState::LiveRepair | DsState::Active) | |||
There was a problem hiding this comment.
It was impossible to go from Active → Faulted; in the previous implementation of on_missing, Active always became Offline. Therefore, this branch only fired if the incoming state is LiveRepair.
mkeeter
force-pushed
the
mkeeter/consolidate-reinitialize
branch
from
57097ed to
67a20d7
Compare
mkeeter
commented
Nov 1, 2024
| @@ -1858,7 +1849,6 @@ impl DownstairsClient { | |||
| String::new() | |||
| }, | |||
| ); | |||
| self.checked_state_transition(up_state, DsState::New); | |||
There was a problem hiding this comment.
This is a drive-by change: the calls to restart_connection below always update the state, so doing it here is superfluous.
mkeeter
commented
Nov 1, 2024
| // If the upstairs is already active (or trying to go active), then the | ||
| // downstairs should automatically call PromoteToActive when it reaches | ||
| // the relevant state. | ||
| let auto_promote = match self.state { |
There was a problem hiding this comment.
auto_promote is a deterministic function of self.state, so we don't need to compute it here (because we're passing &self.state into the function below).
mkeeter
force-pushed
the
mkeeter/consolidate-reinitialize
branch
from
67a20d7 to
489e0d5
Compare
mkeeter
force-pushed
the
mkeeter/consolidate-reinitialize
branch
from
7c40c94 to
a9d7090
Compare
jmpesp
approved these changes
Nov 4, 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.
Previously,
Downstairs::reinitializewould do the following:DownstairsClient::on_missing, which updates the client stateDownstairsClient::reinitialize, which also updates client stateThese used to be separate tasks, but they're now in the same place, so it's silly to have them both.
This PR consolidates all of the logic into
DownstairsClient::reinitialize.