raftstore: change the condition of proposing rollback merge #6584
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
gengliqi
requested review from
BusyJay,
Connor1996,
hicqu,
5kbpers and
overvenus
gengliqi
force-pushed
the
fix-merge-bug-5
branch
from
398ebba
to
f9ccd0d
Compare
|
Please fix the conflict. |
gengliqi
force-pushed
the
fix-merge-bug-5
branch
from
f9ccd0d
to
0cedb5e
Compare
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
force-pushed
the
fix-merge-bug-5
branch
from
cd57266
to
9b9f2d9
Compare
|
PTAL |
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
force-pushed
the
fix-merge-bug-5
branch
2 times, most recently
from
dfe8a1d
to
1c53a53
Compare
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
BusyJay
reviewed
Mar 19, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
force-pushed
the
fix-merge-bug-5
branch
from
30cfa39
to
2db59be
Compare
|
PTAL |
BusyJay
reviewed
Apr 20, 2020
| .peer | ||
| .add_want_rollback_merge_peer(self.fsm.peer_id()); | ||
| if self.fsm.peer.want_rollback_merge_peers.len() | ||
| >= raft::majority( |
There was a problem hiding this comment.
How to ensure peers in want_rollback_merge_peers matches the current peer_list?
There was a problem hiding this comment.
It can be ensured. If a peer can be added to want_rollback_merge_peers, it must be in current peer_list because its PrepareMerge commit index is the same as the leader's.
| self.fsm.peer.pending_merge_state = None; | ||
| self.fsm.peer.want_rollback_merge_peers.clear(); |
There was a problem hiding this comment.
Should clear when applying snapshot.
There was a problem hiding this comment.
After applying a snapshot, on_ready_rollback_merge will be called.
gengliqi
added
the
needs-cherry-pick-release-4.0
|
/run-all-tests |
|
@gengliqi merge failed. |
|
/merge |
|
/run-all-tests |
sre-bot
pushed a commit
to sre-bot/tikv
that referenced
this pull request
Apr 27, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
|
cherry pick to release-4.0 in PR #7664 |
|
I think 3.0 and 3.1 also needs this fix. |
gengliqi
added a commit
to sre-bot/tikv
that referenced
this pull request
Apr 27, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
Yes. 2.1 needs it too. I will add proto first then cherry-pick to these branches |
sre-bot
added a commit
that referenced
this pull request
Apr 30, 2020
yiwu-arbug
added
the
needs-cherry-pick-release-3.1
|
/run-cherry-picker |
sre-bot
pushed a commit
to sre-bot/tikv
that referenced
this pull request
May 8, 2020
Signed-off-by: sre-bot <sre-bot@pingcap.com>
|
cherry pick to release-3.1 in PR #7762 |
gengliqi
added a commit
to sre-bot/tikv
that referenced
this pull request
May 8, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
added a commit
to sre-bot/tikv
that referenced
this pull request
May 8, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
added a commit
to sre-bot/tikv
that referenced
this pull request
May 8, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
c1ay
pushed a commit
to c1ay/tikv
that referenced
this pull request
May 9, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
added a commit
to sre-bot/tikv
that referenced
this pull request
May 9, 2020
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
sre-bot
added a commit
that referenced
this pull request
May 11, 2020
solotzg
added a commit
to pingcap/tidb-engine-ext
that referenced
this pull request
May 14, 2020
txn: only wake up waiters when locks are indeed released (tikv#7379) (tikv#7585) Signed-off-by: youjiali1995 <zlwgx1023@gmail.com> txn: don't protect rollback for BatchRollback (tikv#7605) (tikv#7608) Signed-off-by: youjiali1995 <zlwgx1023@gmail.com> tidb_query: add is true/false keep null ScalarFuncSig (tikv#7532) (tikv#7566) Signed-off-by: zhongzc <zhongzc_arch@outlook.com> tidb_query: fix the logical behavior of floats (tikv#7342) (tikv#7582) Signed-off-by: zhongzc <zhongzc_arch@outlook.com> tidb_query: fix converting bytes to bool (tikv#7486) (tikv#7547) Signed-off-by: zhongzc <zhongzc_arch@outlook.com> raftstore: change the condition of proposing rollback merge (tikv#6584) (tikv#7762) Signed-off-by: Liqi Geng <gengliqiii@gmail.com> Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>
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.
Signed-off-by: Liqi Geng gengliqiii@gmail.com
What have you changed?
In the previous implementation, the source peer will propose rollback merge
after the local target peer's epoch is larger than recorded previously.
In the current implementation, the rollback merge proposal can be proposed only when
the number of peers who want to rollback merge is greater than the majority of all
peers. If so, this merge is impossible to succeed.
The added failpoint test constructs a case that writing data to source region
after merging. This operation can succeed in the previous implementation which
causes data loss.
What is the type of the changes?
How is the PR tested?
Does this PR affect documentation (docs) or should it be mentioned in the release notes?
No
Does this PR affect
tidb-ansible?No