Reset replica flags after stable state fail #1013
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
Signed-off-by: adi_holden <adi@dragonflydb.io>
Signed-off-by: adi_holden <adi@dragonflydb.io>
adiholden
commented
Mar 30, 2023
| LOG(INFO) << "Error greeting " << ec; | ||
| state_mask_ &= ~R_TCP_CONNECTED; | ||
| LOG(INFO) << "Error greeting " << ec << " " << ec.message(); | ||
| state_mask_ &= R_ENABLED; |
There was a problem hiding this comment.
this change has the same affect as ~R_TCP_CONNECTED because the only flag enabled in this state is R_TCP_CONNECTED and R_ENABLED, but this change makes it more readable and if we add new state between connect and greet we will not need to do any change here so this is more robust
adiholden
commented
Mar 30, 2023
| @@ -249,7 +247,8 @@ void Replica::MainReplicationFb() { | |||
| else | |||
| ec = ConsumeRedisStream(); | |||
|
|
|||
| state_mask_ &= ~R_SYNC_OK; | |||
| LOG(WARNING) << "Error full sync " << ec << " " << ec.message(); | |||
| state_mask_ &= R_ENABLED; | |||
There was a problem hiding this comment.
This is the fix. After full sync exit we start from beginning
dranikpg
approved these changes
Mar 30, 2023
Comment on lines
764
to
+765
| LOG(ERROR) << "Bad FLOW response " << ToSV(leftover_buf_->InputBuffer()); | ||
| return make_error_code(errc::bad_message); |
There was a problem hiding this comment.
Wow... I never noticed we skipped this error return
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.
reset replica state to R_ENABLED after stable state exit inorder to start reconnecting to master with new sync id