[main] Revert multi-leader jitter#6455
Merged
Merged
Conversation
deuszx
approved these changes
Jun 6, 2026
171a66b to
6173d67
Compare
afck
approved these changes
Jun 18, 2026
This file contains hidden or 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
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.
Motivation
mainstill runs multi-leader jitter (#6289, plus the default bump in #6359). Ontestnet_conwaythe jitter variant (#6338) was reverted in #6433 ("We found several issues in the PR") following the 2026-05-29 PM-market incident. This bringsmainin line by backing the feature out here too.Alternatively we could try to fix things with #6484
Proposal
git revertof #6289 ("Multi-leader jitter"). Becausemain's jitter is a different commit than the one reverted ontestnet_conway(#6338 was the testnet variant), this is a fresh revert rather than a cherry-pick of #6433.Scope is jitter only:
multi_leader_jitter_target(chain client),multi_leader_proposal_delay(ownership), and the--multi-leader-jitterclient option.multi_leader_roundsdefault change (Increase defaultmulti_leader_roundsfrom 2 to 5 #6359, 2 → 5) — unrelated to jitter.One conflict in
chain_client/mod.rs(the seam where #6289 inserted the jitter fn beforeclear_pending_proposal) was resolved by keepingmain's currentclear_pending_proposaldefinition.Test Plan
cargo build/cargo checkclean onlinera-base,linera-core,linera-client.cargo clippy --all-targetsclean (no dangling references to removed jitter symbols anywhere in the tree).cargo test -p linera-base ownershipgreen.Release Plan
testnet_conwayalready reverted the equivalent change.)Links
testnet_conwayrevert: Revert "[testnet] multi-leader jitter and conflict-detection fix (#63… #6433 (which reverted the testnet variant [testnet] multi-leader jitter and conflict-detection fix #6338)