replication: fix wrong assumption in box.ctl.make_bootstrap_leader#11862
Merged
sergepetrenko merged 1 commit intotarantool:masterfrom Oct 10, 2025
Merged
Conversation
c3f6737 to
43be698
Compare
Collaborator
sergepetrenko
left a comment
There was a problem hiding this comment.
Thanks for the patch!
georgiy-belyanin
approved these changes
Sep 30, 2025
Member
georgiy-belyanin
left a comment
There was a problem hiding this comment.
I have tested it with the corresponding logic inside the Tarantool failover coordinator and it seems OK. Thank you for working on it.
43be698 to
599b991
Compare
`box_make_bootstrap_leader` assumes that by the time the instance UID is assigned, the bootstrap strategy is also assigned. However, this assumption does not hold during recovery, since the instance UID is assigned during engine recovery from the snapshot at an earlier stage of recovery, and the fiber executing `box.cfg` yields because of `iproto_do_cfg` before the bootstrap strategy is set. To fix this, let's throw an error iff the bootstrap strategy is set, and it is not `supervised`. Closes tarantool#11704 NO_DOC=<bugfix>
599b991 to
c682a98
Compare
maryiaLichko
approved these changes
Oct 10, 2025
Collaborator
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release/3.2
git worktree add -d .worktree/backport/release/3.2/11862 origin/release/3.2
cd .worktree/backport/release/3.2/11862
git switch --create backport/release/3.2/11862
git cherry-pick -x c5ca705e5710afb85335d25355af9f535c03123a |
Collaborator
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release/3.3
git worktree add -d .worktree/backport/release/3.3/11862 origin/release/3.3
cd .worktree/backport/release/3.3/11862
git switch --create backport/release/3.3/11862
git cherry-pick -x c5ca705e5710afb85335d25355af9f535c03123a |
Collaborator
|
Successfully created backport PR for |
Collaborator
|
Successfully created backport PR for |
Collaborator
Backport summary
|
This was referenced Oct 10, 2025
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
6 participants
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.
This patch fixes a wrong assumption about bootstrap during recovery in
box.ctl.make_bootstrap_leader.Closes #11704