Skipping upload when no diff

Signed-off-by: Bukhtawar Khan <[email protected]>
opensearch-project · Aug 4, 2024 · 4607c5d · 4607c5d
1 parent 607317a
commit 4607c5d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/...rc/main/java/org/opensearch/cluster/routing/remote/InternalRemoteRoutingTableService.java b/...rc/main/java/org/opensearch/cluster/routing/remote/InternalRemoteRoutingTableService.java
@@ -148,7 +148,11 @@ public void getAsyncIndexRoutingDiffWriteAction(
                 term,
                 version
         );
-
+        if (remoteRoutingTableDiff.getDiffs().isEmpty()) {
+            logger.info("No index routing diff found, completing request");
+            latchedActionListener.onResponse(null);
+            return;
+        }
         ActionListener<Void> completionListener = ActionListener.wrap(
                 resp -> latchedActionListener.onResponse(remoteRoutingTableDiff.getUploadedMetadata()),
                 ex -> latchedActionListener.onFailure(

diff --git a/server/src/main/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableService.java b/server/src/main/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableService.java
@@ -79,8 +79,8 @@ List<ClusterMetadataManifest.UploadedIndexMetadata> getAllUploadedIndicesRouting
         List<String> indicesRoutingToDelete
     );
 
-    public void deleteStaleIndexRoutingPaths(List<String> stalePaths) throws IOException;
+    void deleteStaleIndexRoutingPaths(List<String> stalePaths) throws IOException;
 
-    public void deleteStaleIndexRoutingDiffPaths(List<String> stalePaths) throws IOException;
+    void deleteStaleIndexRoutingDiffPaths(List<String> stalePaths) throws IOException;
 
 }
diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
@@ -536,7 +536,7 @@ public void testTimeoutWhileWritingManifestFile() throws IOException {
                 anyMap(),
                 anyBoolean(),
                 anyList(),
-                anyMap()
+                any(RoutingTable.class)
             )
         ).thenReturn(new RemoteClusterStateUtils.UploadedMetadataResults());
         RemoteStateTransferException ex = expectThrows(
@@ -687,7 +687,7 @@ public void testWriteIncrementalMetadataSuccess() throws IOException {
                 eq(Collections.emptyMap()),
                 eq(false),
                 eq(Collections.emptyList()),
-                eq(Collections.emptyMap())
+                eq(clusterState.getRoutingTable())
             );
 
         assertThat(manifestInfo.getManifestFileName(), notNullValue());
@@ -768,7 +768,7 @@ public void testWriteIncrementalMetadataSuccessWhenPublicationEnabled() throws I
                 eq(Collections.emptyMap()),
                 eq(true),
                 anyList(),
-                eq(Collections.emptyMap())
+                eq(clusterState.getRoutingTable())
             );
 
         assertThat(manifestInfo.getManifestFileName(), notNullValue());