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

Remove global checkpoint assertion in index shard 

Due to races, this assertion in index shard can be wrong. This commit
removes that assertion and adjusts the explanatory comment.
This commit is contained in:
Jason Tedor 2017-05-04 10:29:00 -04:00
parent 977016ba25
commit 50b617f73a
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/org/elasticsearch/index/shard/IndexShard.java
View File

@ -1523,20 +1523,20 @@ public class IndexShard extends AbstractIndexShardComponent implements IndicesCl
verifyReplicationTarget(); verifyReplicationTarget();
final SequenceNumbersService seqNoService = getEngine().seqNoService(); final SequenceNumbersService seqNoService = getEngine().seqNoService();
final long localCheckpoint = seqNoService.getLocalCheckpoint(); final long localCheckpoint = seqNoService.getLocalCheckpoint();
if (globalCheckpoint <= localCheckpoint) { if (globalCheckpoint > localCheckpoint) {
seqNoService.updateGlobalCheckpointOnReplica(globalCheckpoint);
} else {
/* /*
* This can happen during recovery when the shard has started its engine but recovery is not finalized and is receiving global * This can happen during recovery when the shard has started its engine but recovery is not finalized and is receiving global
* checkpoint updates from in-flight operations. However, since this shard is not yet contributing to calculating the global * checkpoint updates. However, since this shard is not yet contributing to calculating the global checkpoint, it can be the
* checkpoint, it can be the case that the global checkpoint update from the primary is ahead of the local checkpoint on this * case that the global checkpoint update from the primary is ahead of the local checkpoint on this shard. In this case, we
* shard. In this case, we ignore the global checkpoint update. This should only happen if we are in the translog stage of * ignore the global checkpoint update. This can happen if we are in the translog stage of recovery. Prior to this, the engine
* recovery. Prior to this, the engine is not opened and this shard will not receive global checkpoint updates, and after this * is not opened and this shard will not receive global checkpoint updates, and after this the shard will be contributing to
* the shard will be contributing to calculations of the the global checkpoint. * calculations of the the global checkpoint. However, we can not assert that we are in the translog stage of recovery here as
* while the global checkpoint update may have emanated from the primary when we were in that state, we could subsequently move
* to recovery finalization, or even finished recovery before the update arrives here.
*/ */
assert recoveryState().getStage() == RecoveryState.Stage.TRANSLOG return;
: "expected recovery stage [" + RecoveryState.Stage.TRANSLOG + "] but was [" + recoveryState().getStage() + "]";
} }
seqNoService.updateGlobalCheckpointOnReplica(globalCheckpoint);
} }
/** /**