Skip to content

Replica starts peer recovery with safe commit #28181

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jan 13, 2018
Merged

Replica starts peer recovery with safe commit #28181

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2509d17
Replica starts peer recovery with a safe commit
dnhatn Jan 10, 2018
9d7db40
Use additional bool for sequence based recovery
dnhatn Jan 11, 2018
c9152ea
test: restore extra check
dnhatn Jan 11, 2018
2ff5354
goodDocs -> initDocs
dnhatn Jan 11, 2018
d66ba4b
Merge branch 'master' into rollback-replica
dnhatn Jan 11, 2018
1eea7b1
Rename createNewTranslog
dnhatn Jan 11, 2018
9b25413
feedbacks
dnhatn Jan 11, 2018
efb5149
Merge branch 'master' into rollback-replica
dnhatn Jan 11, 2018
2642d7e
Merge branch 'master' into rollback-replica
dnhatn Jan 12, 2018
3ef8bf5
update the todo note
dnhatn Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ private void ensureRefCount() {
public void prepareForTranslogOperations(boolean createNewTranslog, int totalTranslogOps) throws IOException {
state().getTranslog().totalOperations(totalTranslogOps);
if (createNewTranslog) {
// TODO: take the local checkpoint from store as global checkpoint, once we know it's safe
Copy link
Contributor

@bleskes bleskes Jan 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add when you expect it to be safe (what version)

indexShard().openIndexAndCreateTranslog(false, SequenceNumbers.UNASSIGNED_SEQ_NO);
} else {
indexShard().openIndexAndSkipTranslogRecovery();
Expand Down
3 changes: 2 additions & 1 deletion core/src/test/java/org/elasticsearch/index/replication/RecoveryDuringReplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception {

// As a replica keeps a safe commit, the file-based recovery only happens if the required translog
// for the sequence based recovery are not fully retained and extra documents were added to the primary.
boolean expectSeqNoRecovery = (moreDocs == 0 || frequently());
boolean expectSeqNoRecovery = (moreDocs == 0 || randomBoolean());
int uncommittedOpsOnPrimary = 0;
if (expectSeqNoRecovery == false) {
IndexMetaData.Builder builder = IndexMetaData.builder(newPrimary.indexSettings().getIndexMetaData());
Expand All @@ -270,6 +270,7 @@ public void testRecoveryAfterPrimaryPromotion() throws Exception {
shards.syncGlobalCheckpoint();
newPrimary.flush(new FlushRequest());
uncommittedOpsOnPrimary = shards.indexDocs(randomIntBetween(0, 10));
totalDocs += uncommittedOpsOnPrimary;
}

if (randomBoolean()) {
Expand Down