honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Call afterWriteOperation after trim translog in peer recovery (#45182) 

testShouldFlushAfterPeerRecovery was added #28350 to make sure the
flushing loop triggered by afterWriteOperation eventually terminates.
This test relies on the fact that we call afterWriteOperation after
making changes in translog. In #44756, we roll a new generation in
RecoveryTarget#finalizeRecovery but do not call afterWriteOperation.

Relates #28350
Relates #45073
This commit is contained in:
Nhat Nguyen 2019-08-05 13:55:43 -04:00
parent 25c6102101
commit cf9a73b5ac
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/main/java/org/elasticsearch/indices/recovery/RecoveryTarget.java
View File

@ -296,9 +296,6 @@ public class RecoveryTarget extends AbstractRefCounted implements RecoveryTarget
// Persist the global checkpoint. // Persist the global checkpoint.
indexShard.sync(); indexShard.sync();
indexShard.persistRetentionLeases(); indexShard.persistRetentionLeases();
if (hasUncommittedOperations()) {
indexShard.flush(new FlushRequest().force(true).waitIfOngoing(true));
}
if (trimAboveSeqNo != SequenceNumbers.UNASSIGNED_SEQ_NO) { if (trimAboveSeqNo != SequenceNumbers.UNASSIGNED_SEQ_NO) {
// We should erase all translog operations above trimAboveSeqNo as we have received either the same or a newer copy // We should erase all translog operations above trimAboveSeqNo as we have received either the same or a newer copy
// from the recovery source in phase2. Rolling a new translog generation is not strictly required here for we won't // from the recovery source in phase2. Rolling a new translog generation is not strictly required here for we won't
@ -306,8 +303,13 @@ public class RecoveryTarget extends AbstractRefCounted implements RecoveryTarget
// operation that would be trimmed (see TranslogWriter#assertNoSeqAbove). This assumption does not hold for peer // operation that would be trimmed (see TranslogWriter#assertNoSeqAbove). This assumption does not hold for peer
// recovery because we could have received operations above startingSeqNo from the previous primary terms. // recovery because we could have received operations above startingSeqNo from the previous primary terms.
indexShard.rollTranslogGeneration(); indexShard.rollTranslogGeneration();
// the flush or translog generation threshold can be reached after we roll a new translog
indexShard.afterWriteOperation();
indexShard.trimOperationOfPreviousPrimaryTerms(trimAboveSeqNo); indexShard.trimOperationOfPreviousPrimaryTerms(trimAboveSeqNo);
} }
if (hasUncommittedOperations()) {
indexShard.flush(new FlushRequest().force(true).waitIfOngoing(true));
}
indexShard.finalizeRecovery(); indexShard.finalizeRecovery();
return null; return null;
}); });