Fix flaky remote cluster state UT (#10784)

Signed-off-by: Dhwanil Patel <[email protected]>
opensearch-project · Oct 22, 2023 · 0a934db · 0a934db
1 parent 48b3f4d
commit 0a934db
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
@@ -458,7 +458,7 @@ public void testGlobalMetadataOnlyUpdated() throws IOException {
         mockBlobStoreObjects();
         final CoordinationMetadata coordinationMetadata = CoordinationMetadata.builder().term(1L).build();
         final ClusterState initialClusterState = ClusterState.builder(ClusterName.DEFAULT)
-            .metadata(Metadata.builder().coordinationMetadata(coordinationMetadata))
+            .metadata(Metadata.builder().coordinationMetadata(coordinationMetadata).version(randomNonNegativeLong()))
             .build();
         final ClusterMetadataManifest initialManifest = ClusterMetadataManifest.builder()
             .codecVersion(2)
@@ -479,6 +479,7 @@ public void testGlobalMetadataOnlyUpdated() throws IOException {
         // new cluster state where only global metadata is different
         Metadata newMetadata = Metadata.builder(clusterState.metadata())
             .persistentSettings(Settings.builder().put("cluster.blocks.read_only", true).build())
+            .version(randomNonNegativeLong())
             .build();
         ClusterState newClusterState = ClusterState.builder(clusterState).metadata(newMetadata).build();
 
@@ -1281,7 +1282,12 @@ private static ClusterState.Builder generateClusterStateWithOneIndex() {
             .version(1L)
             .stateUUID("state-uuid")
             .metadata(
-                Metadata.builder().put(indexMetadata, true).clusterUUID("cluster-uuid").coordinationMetadata(coordinationMetadata).build()
+                Metadata.builder()
+                    .version(randomNonNegativeLong())
+                    .put(indexMetadata, true)
+                    .clusterUUID("cluster-uuid")
+                    .coordinationMetadata(coordinationMetadata)
+                    .build()
             );
     }