[master] Initiate rejoin of nodes for out of sync scenarios #2571
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
github-actions
bot
changed the title
chetan-zilliqa
force-pushed
the
zil-2960-seed-recovery
branch
from
15f6baf
to
0602f1b
Compare
chetan-zilliqa
requested review from
KaustubhShamshery and
bb111189
and removed request for
bb111189 and
KaustubhShamshery
chetan-zilliqa
force-pushed
the
zil-2960-seed-recovery
branch
from
a4b5da6
to
6109f8f
Compare
sandipbhoir
suggested changes
Jun 8, 2021
src/libLookup/Lookup.cpp
Outdated
| @@ -95,6 +95,7 @@ Lookup::~Lookup() {} | |||
| void Lookup::InitSync() { | |||
| LOG_MARKER(); | |||
| auto func = [this]() -> void { | |||
| LOG_GENERAL(INFO, "###### NodeRejoin: InitSync started thread ######"); | |||
There was a problem hiding this comment.
May be remove NodeRejoin keyword since InitSync could be called or
During Rejoin but at startup as well.
src/libLookup/Lookup.cpp
Outdated
| "Seems we have received all or few of txblocks " | ||
| "previously. " | ||
| "so ignoring these txblocks!"); | ||
| // cv_setRejoinRecovery.notify_all(); //TODO : Check with @Sandip if we |
There was a problem hiding this comment.
need to notify right? otherwise cv_setRejoinRecovery will wait for 180 sec in InitSync
sandipbhoir
approved these changes
Jun 9, 2021
src/libLookup/Lookup.cpp
Outdated
| LOG_MARKER(); | ||
|
|
||
| auto func = [this]() -> void { | ||
| while (GetSyncType() != SyncType::NO_SYNC) { |
There was a problem hiding this comment.
code seems identical to above, maybe make a function?:>
src/libLookup/Lookup.cpp
Outdated
| @@ -2981,6 +2992,8 @@ bool Lookup::ProcessSetTxBlockFromSeed( | |||
| WARNING, | |||
| "The lowBlockNum is higher than highblocknum, maybe DS epoch ongoing"); | |||
| cv_setTxBlockFromSeed.notify_all(); | |||
| // cv_setRejoinRecovery.notify_all(); // No need to notify as we need to | |||
There was a problem hiding this comment.
what constant denotes 180 seconds? maybe mention that
There was a problem hiding this comment.
Removed the line as it was initially kept for my understanding
KaustubhShamshery
suggested changes
Jun 11, 2021
sandipbhoir
approved these changes
Jun 11, 2021
KaustubhShamshery
approved these changes
Jun 11, 2021
chetan-zilliqa
force-pushed
the
zil-2960-seed-recovery
branch
from
a12b8d9
to
16f6906
Compare
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.
Description
This PR targets seed nodes and seedpub nodes rejoin during the following scenarios.
Backward Compatibility
Testing
Below is the testsheet link.
https://docs.google.com/spreadsheets/d/1ZtXREAGIpTyUJlzXYtatpY9ZA8k5yE7FiwUaJ7Rgaow/edit#gid=1075062091
Review Suggestion
Status
Implementation
Integration Test (Core Team)