strengthen operation-based condition

elastic · Apr 29, 2019 · 35c527b · 35c527b
1 parent 042ceb4
commit 35c527b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java b/server/src/main/java/org/elasticsearch/index/engine/ReadOnlyEngine.java
@@ -300,7 +300,8 @@ public int estimateNumberOfHistoryOperations(String source, MapperService mapper
 
     @Override
     public boolean hasCompleteOperationHistory(String source, MapperService mapperService, long startingSeqNo) throws IOException {
-        return startingSeqNo > seqNoStats.getLocalCheckpoint();
+        // we can do operation-based recovery if we don't have to replay any operation.
+        return startingSeqNo > seqNoStats.getMaxSeqNo();
     }
 
     @Override

diff --git a/server/src/test/java/org/elasticsearch/indices/state/CloseIndexIT.java b/server/src/test/java/org/elasticsearch/indices/state/CloseIndexIT.java
@@ -349,22 +349,26 @@ public void testNoopPeerRecoveriesWhenIndexClosed() throws Exception {
             .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, numberOfReplicas)
             .put("index.routing.rebalance.enable", "none")
             .build());
-        indexRandom(randomBoolean(), false, randomBoolean(), IntStream.range(0, randomIntBetween(0, 50))
-            .mapToObj(i -> client().prepareIndex(indexName, "_doc").setSource("num", i)).collect(toList()));
-        ensureGreen(indexName);
-
-        // Closing an index should execute noop peer recovery
-        assertAcked(client().admin().indices().prepareClose(indexName).get());
-        assertIndexIsClosed(indexName);
-        ensureGreen(indexName);
-        assertNoFileBasedRecovery(indexName);
-
-        // Open a closed index should execute noop recovery
-        assertAcked(client().admin().indices().prepareOpen(indexName).get());
-        assertIndexIsOpened(indexName);
-        ensureGreen(indexName);
-        assertNoFileBasedRecovery(indexName);
-        internalCluster().assertSameDocIdsOnShards();
+        int iterations = between(1, 3);
+        for (int iter = 0; iter < iterations; iter++) {
+            indexRandom(randomBoolean(), randomBoolean(), randomBoolean(), IntStream.range(0, randomIntBetween(0, 50))
+                .mapToObj(n -> client().prepareIndex(indexName, "_doc").setSource("num", n)).collect(toList()));
+            ensureGreen(indexName);
+
+            // Closing an index should execute noop peer recovery
+            assertAcked(client().admin().indices().prepareClose(indexName).get());
+            assertIndexIsClosed(indexName);
+            ensureGreen(indexName);
+            assertNoFileBasedRecovery(indexName);
+            internalCluster().assertSameDocIdsOnShards();
+
+            // Open a closed index should execute noop recovery
+            assertAcked(client().admin().indices().prepareOpen(indexName).get());
+            assertIndexIsOpened(indexName);
+            ensureGreen(indexName);
+            assertNoFileBasedRecovery(indexName);
+            internalCluster().assertSameDocIdsOnShards();
+        }
     }
 
     static void assertIndexIsClosed(final String... indices) {