-
Notifications
You must be signed in to change notification settings - Fork 25
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CSJ: prefer the Objector when replacing a Dynamo #1417
Merged
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
13cc60d
to
a4c0109
Compare
nfrisby
commented
Mar 7, 2025
...nsensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs
Show resolved
Hide resolved
a4c0109
to
407d2c9
Compare
407d2c9
to
0306d8f
Compare
amesgen
approved these changes
Mar 10, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, only very minor comments
Also great tracing/pretty-printing improvements, will be nice for any future test deep dives 👏
...nsensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs
Show resolved
Hide resolved
...nsensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs
Outdated
Show resolved
Hide resolved
...nsensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs
Outdated
Show resolved
Hide resolved
...nsensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs
Show resolved
Hide resolved
...nsensus/src/ouroboros-consensus/Ouroboros/Consensus/MiniProtocol/ChainSync/Client/Jumping.hs
Outdated
Show resolved
Hide resolved
0306d8f
to
b503287
Compare
By printing the branches in order of descending intersection slot number, it makes it obvious that they all branch off from the trunk, and not off of each other.
This patch was introduced in response to a CSJ test failure; the property expects that no honest header will be downloaded multiple times. Shape of the failing test: - The first Dynamo was adversary 3. - honest 3 became the Objector, and killed that Dynamo. - The next Dynamo was adversary 1. - honest 1 became the Objector, and killed that Dynamo. As as a result, some honest headers were downloaded by both honest 1 and honest 3. This commit also renames `electNewDynamo` to `backfillDynamo` in order to empahsize that this is only called when the Dynamo is lost. In particular, it's not called by `rotateDynamo`.
b503287
to
c914969
Compare
I didn't realize the older commits weren't signed. So I did a rebase that merely signed them --- I'm expecting auto-merge to work now. |
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.
See the various commits. The
CSJ: prefer the Objector when replacing a Dynamo
commit in particular explains the key change within this PR.