Cleanup tighten sequence number recovery

elastic · Dec 17, 2016 · b9f68d4 · b9f68d4
1 parent 2a8d069
commit b9f68d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java b/core/src/main/java/org/elasticsearch/index/engine/InternalEngine.java
@@ -609,7 +609,6 @@ private IndexResult innerIndex(Index index) throws IOException {
         assert assertSequenceNumber(index.origin(), index.seqNo());
         final Translog.Location location;
         final long updatedVersion;
-        IndexResult indexResult = null;
         long seqNo = index.seqNo();
         try (Releasable ignored = acquireLock(index.uid())) {
             lastWriteNanos = index.startTime();
@@ -684,6 +683,7 @@ private IndexResult innerIndex(Index index) throws IOException {
                     () -> new IndexResult(currentVersion, index.seqNo(), false),
                     e -> new IndexResult(e, currentVersion, index.seqNo()));
 
+            final IndexResult indexResult;
             if (checkVersionConflictResult.isPresent()) {
                 indexResult = checkVersionConflictResult.get();
             } else {
@@ -789,7 +789,6 @@ private DeleteResult innerDelete(Delete delete) throws IOException {
         final Translog.Location location;
         final long updatedVersion;
         final boolean found;
-        DeleteResult deleteResult = null;
         long seqNo = delete.seqNo();
         try (Releasable ignored = acquireLock(delete.uid())) {
             lastWriteNanos = delete.startTime();
@@ -816,6 +815,7 @@ private DeleteResult innerDelete(Delete delete) throws IOException {
                     () -> new DeleteResult(expectedVersion, delete.seqNo(), true),
                     e -> new DeleteResult(e, expectedVersion, delete.seqNo()));
 
+            final DeleteResult deleteResult;
             if (result.isPresent()) {
                 deleteResult = result.get();
             } else {
@@ -838,7 +838,7 @@ private DeleteResult innerDelete(Delete delete) throws IOException {
             return deleteResult;
         } finally {
             if (seqNo != SequenceNumbersService.UNASSIGNED_SEQ_NO) {
-                seqNoService().markSeqNoAsCompleted(deleteResult.getSeqNo());
+                seqNoService().markSeqNoAsCompleted(seqNo);
             }
         }
     }

diff --git a/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/core/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java
@@ -157,6 +157,7 @@
 import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyMap;
+import static org.elasticsearch.index.engine.Engine.Operation.Origin.LOCAL_TRANSLOG_RECOVERY;
 import static org.elasticsearch.index.engine.Engine.Operation.Origin.PRIMARY;
 import static org.elasticsearch.index.engine.Engine.Operation.Origin.REPLICA;
 import static org.elasticsearch.index.engine.Engine.Operation.Origin.PEER_RECOVERY;
@@ -3036,7 +3037,7 @@ public void testSequenceNumberAdvancesToMaxSeqNoOnEngineOpenOnReplica() throws I
 
         try (final Engine recoveringEngine =
                  new InternalEngine(copy(initialEngine.config(), EngineConfig.OpenMode.OPEN_INDEX_AND_TRANSLOG))) {
-            assertThat(recoveringEngine.seqNoService().getLocalCheckpoint(), greaterThanOrEqualTo((long) (3 * docs + 2 - 1)));
+            assertThat(recoveringEngine.seqNoService().getLocalCheckpoint(), greaterThanOrEqualTo((long) (3 * (docs - 1) + 2 - 1)));
         }
     }
 
@@ -3047,7 +3048,7 @@ public void testOutOfOrderSequenceNumbersWithVersionConflict() throws IOExceptio
         final Term uid = newUid("1");
         final Document document = testDocumentWithTextField();
         final AtomicLong sequenceNumber = new AtomicLong();
-        final Engine.Operation.Origin origin = randomFrom(PEER_RECOVERY, PRIMARY, PEER_RECOVERY);
+        final Engine.Operation.Origin origin = randomFrom(LOCAL_TRANSLOG_RECOVERY, PEER_RECOVERY, PRIMARY, REPLICA);
         final LongSupplier sequenceNumberSupplier =
             origin == PRIMARY ? () -> SequenceNumbersService.UNASSIGNED_SEQ_NO : sequenceNumber::getAndIncrement;
         document.add(new Field(SourceFieldMapper.NAME, BytesReference.toBytes(B_1), SourceFieldMapper.Defaults.FIELD_TYPE));