Prevent CCR recovery from missing documents #38472
Merged
Conversation
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
Currently the snapshot/restore process manually sets the global checkpoint to the max sequence number from the restored segements. This does not work for Ccr as this will lead to documents that would be recovered in the normal followering operation from being recovered. This commit fixes this issue by setting the initial global checkpoint to the existing local checkpoint.
Tim-Brooks
added
>non-issue
:Distributed Indexing/CCR
|
Pinging @elastic/es-distributed |
|
@ywelsch - looks like all of CI passed with the assertions that if local is null, so is max. So do you want to move forward with this? I can remove the assertions if you think they are unnecessary. |
ywelsch
approved these changes
Feb 8, 2019
| final String rawLocalCheckpoint = userData.get(SequenceNumbers.LOCAL_CHECKPOINT_KEY); | ||
| final String rawMaxSeqNo = userData.get(SequenceNumbers.MAX_SEQ_NO); | ||
| if (rawLocalCheckpoint == null) { | ||
| assert rawMaxSeqNo == null : "Local checkpoint null but max sequence number: " + rawMaxSeqNo; |
There was a problem hiding this comment.
You can remove the if block and instead write the following 2 assertions:
assert (rawLocalCheckpoint == null) == (rawMaxSeqNo == null) :
"local checkpoint was " + rawLocalCheckpoint + " but max seq no was " + rawMaxSeqNo;
assert rawLocalCheckpoint != null || segmentCommitInfos.getCommitLuceneVersion().major < 7 :
"Found Lucene version: " + segmentCommitInfos.getCommitLuceneVersion().major;
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.
Currently the snapshot/restore process manually sets the global
checkpoint to the max sequence number from the restored segements. This
does not work for Ccr as this will lead to documents that would be
recovered in the normal followering operation from being recovered.
This commit fixes this issue by setting the initial global checkpoint to
the existing local checkpoint.