Address review comments & mute breaking bwc-test

Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89 · Jul 10, 2023 · b84762d · b84762d
1 parent bd015d1
commit b84762d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/IndexingIT.java b/qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/IndexingIT.java
@@ -247,6 +247,7 @@ public void testIndexing() throws IOException, ParseException {
      *
      * @throws Exception
      */
+    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/8322")
     public void testIndexingWithSegRep() throws Exception {
         if (UPGRADE_FROM_VERSION.before(Version.V_2_4_0)) {
             logger.info("--> Skip test for version {} where segment replication feature is not available", UPGRADE_FROM_VERSION);

diff --git a/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationSourceHandler.java b/server/src/main/java/org/opensearch/indices/replication/SegmentReplicationSourceHandler.java
@@ -112,7 +112,7 @@ public synchronized void sendFiles(GetSegmentFilesRequest request, ActionListene
         // Short circuit when no files to transfer
         if (request.getFilesToFetch().isEmpty()) {
             // before completion, alert the primary of the replica's state.
-            this.updateVisibleCheckpointForShard(request.getTargetAllocationId(), copyState.getCheckpoint());
+            shard.updateVisibleCheckpointForShard(request.getTargetAllocationId(), copyState.getCheckpoint());
             listener.onResponse(new GetSegmentFilesResponse(Collections.emptyList()));
             return;
         }
@@ -169,7 +169,7 @@ public synchronized void sendFiles(GetSegmentFilesRequest request, ActionListene
 
             sendFileStep.whenComplete(r -> {
                 try {
-                    this.updateVisibleCheckpointForShard(allocationId, copyState.getCheckpoint());
+                    shard.updateVisibleCheckpointForShard(allocationId, copyState.getCheckpoint());
                     future.onResponse(new GetSegmentFilesResponse(List.of(storeFileMetadata)));
                 } finally {
                     IOUtils.close(resources);
@@ -187,15 +187,6 @@ public synchronized void sendFiles(GetSegmentFilesRequest request, ActionListene
         }
     }
 
-    // Update target replication checkpoint on source for node-node communication. For remote store enabled indices, checkpoint
-    // update on source is performed via separate UPDATE_VISIBLE_CHECKPOINT transport call
-    private void updateVisibleCheckpointForShard(String allocationId, ReplicationCheckpoint replicationCheckpoint) {
-        if (shard.indexSettings().isRemoteStoreEnabled() == false) {
-            // update visible checkpoint to primary
-            shard.updateVisibleCheckpointForShard(allocationId, replicationCheckpoint);
-        }
-    }
-
     /**
      * Cancels the replication and interrupts all eligible threads.
      */

diff --git a/...rc/test/java/org/opensearch/indices/replication/SegmentReplicationSourceHandlerTests.java b/...rc/test/java/org/opensearch/indices/replication/SegmentReplicationSourceHandlerTests.java
@@ -196,11 +196,13 @@ public void testReplicationAlreadyRunning() throws IOException {
             1
         );
 
+        final List<StoreFileMetadata> expectedFiles = List.of(new StoreFileMetadata("_0.si", 20, "test", Version.CURRENT.luceneVersion));
+
         final GetSegmentFilesRequest getSegmentFilesRequest = new GetSegmentFilesRequest(
             1L,
             replica.routingEntry().allocationId().getId(),
             replicaDiscoveryNode,
-            Collections.emptyList(),
+            expectedFiles,
             latestReplicationCheckpoint
         );
 
@@ -224,11 +226,12 @@ public void testCancelReplication() throws IOException, InterruptedException {
             1
         );
 
+        final List<StoreFileMetadata> expectedFiles = List.of(new StoreFileMetadata("_0.si", 20, "test", Version.CURRENT.luceneVersion));
         final GetSegmentFilesRequest getSegmentFilesRequest = new GetSegmentFilesRequest(
             1L,
             replica.routingEntry().allocationId().getId(),
             replicaDiscoveryNode,
-            Collections.emptyList(),
+            expectedFiles,
             latestReplicationCheckpoint
         );