Fix broken test.

Signed-off-by: Marc Handalian <[email protected]>
opensearch-project · Mar 13, 2023 · 3742c1b · 3742c1b
1 parent ccd5694
commit 3742c1b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/src/main/java/org/opensearch/index/engine/NRTReplicationReaderManager.java b/server/src/main/java/org/opensearch/index/engine/NRTReplicationReaderManager.java
@@ -53,12 +53,11 @@ public class NRTReplicationReaderManager extends OpenSearchReaderManager {
         OpenSearchDirectoryReader reader,
         Consumer<Collection<String>> onNewReader,
         Consumer<Collection<String>> onReaderClosed
-    ) throws IOException {
+    ) {
         super(reader);
         currentInfos = unwrapStandardReader(reader).getSegmentInfos();
         this.onReaderClosed = onReaderClosed;
         this.onNewReader = onNewReader;
-        onNewReader.accept(currentInfos.files(true));
     }
 
     @Override

diff --git a/server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java b/server/src/test/java/org/opensearch/index/shard/SegmentReplicationIndexShardTests.java
@@ -583,6 +583,8 @@ public void testReplicaReceivesLowerGeneration() throws Exception {
             IndexShard oldPrimary = shards.addReplicaWithExistingPath(primary.shardPath(), primary.routingEntry().currentNodeId());
             shards.recoverReplica(oldPrimary);
             assertLatestCommitGen(5, oldPrimary);
+            // commitGen is now 6 instead of 5 bc IE will trim any retained unsafe commits from the replica.
+            // This now happens as readers incref existing segments.
             assertLatestCommitGen(5, replica_2);
 
             numDocs = randomIntBetween(numDocs + 1, numDocs + 10);