Fix flaky tests in org.opensearch.cluster.routing.remote.RemoteRoutin…

…gTableServiceTests (#14264) Signed-off-by: Gao Binlong <[email protected]> (cherry picked from commit 5ec2abe) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jun 17, 2024 · 61a7064 · 61a7064
1 parent eb6471d
commit 61a7064
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/...r/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java b/...r/src/test/java/org/opensearch/cluster/routing/remote/RemoteRoutingTableServiceTests.java
@@ -227,11 +227,11 @@ public void testGetIndicesRoutingMapDiffIndexAdded() {
                 .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
                 .put(IndexMetadata.SETTING_INDEX_UUID, "uuid")
                 .build()
-        ).numberOfShards(randomInt(1000)).numberOfReplicas(randomInt(10)).build();
+        ).numberOfShards(between(1, 1000)).numberOfReplicas(randomInt(10)).build();
         RoutingTable routingTable = RoutingTable.builder().addAsNew(indexMetadata).build();
 
         String indexName2 = randomAlphaOfLength(randomIntBetween(1, 50));
-        int noOfShards = randomInt(1000);
+        int noOfShards = between(1, 1000);
         int noOfReplicas = randomInt(10);
         final IndexMetadata indexMetadata2 = new IndexMetadata.Builder(indexName2).settings(
             Settings.builder()
@@ -252,8 +252,7 @@ public void testGetIndicesRoutingMapDiffIndexAdded() {
 
     public void testGetIndicesRoutingMapDiffShardChanged() {
         String indexName = randomAlphaOfLength(randomIntBetween(1, 50));
-        final Index index = new Index(indexName, "uuid");
-        int noOfShards = randomInt(1000);
+        int noOfShards = between(1, 1000);
         int noOfReplicas = randomInt(10);
         final IndexMetadata indexMetadata = new IndexMetadata.Builder(indexName).settings(
             Settings.builder()
@@ -299,8 +298,7 @@ public void testGetIndicesRoutingMapDiffShardChanged() {
 
     public void testGetIndicesRoutingMapDiffShardDetailChanged() {
         String indexName = randomAlphaOfLength(randomIntBetween(1, 50));
-        final Index index = new Index(indexName, "uuid");
-        int noOfShards = randomInt(1000);
+        int noOfShards = between(1, 1000);
         int noOfReplicas = randomInt(10);
         final IndexMetadata indexMetadata = new IndexMetadata.Builder(indexName).settings(
             Settings.builder()
@@ -328,7 +326,7 @@ public void testGetIndicesRoutingMapDiffIndexDeleted() {
                 .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
                 .put(IndexMetadata.SETTING_INDEX_UUID, "uuid")
                 .build()
-        ).numberOfShards(randomInt(1000)).numberOfReplicas(randomInt(10)).build();
+        ).numberOfShards(between(1, 1000)).numberOfReplicas(randomInt(10)).build();
         RoutingTable routingTable = RoutingTable.builder().addAsNew(indexMetadata).build();
 
         String indexName2 = randomAlphaOfLength(randomIntBetween(1, 50));
@@ -337,7 +335,7 @@ public void testGetIndicesRoutingMapDiffIndexDeleted() {
                 .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
                 .put(IndexMetadata.SETTING_INDEX_UUID, "uuid2")
                 .build()
-        ).numberOfShards(randomInt(1000)).numberOfReplicas(randomInt(10)).build();
+        ).numberOfShards(between(1, 1000)).numberOfReplicas(randomInt(10)).build();
         RoutingTable routingTable2 = RoutingTable.builder().addAsNew(indexMetadata2).build();
 
         DiffableUtils.MapDiff<String, IndexRoutingTable, Map<String, IndexRoutingTable>> diff = remoteRoutingTableService
@@ -732,7 +730,6 @@ private ClusterState createIndices(int numberOfIndices) {
         RoutingTable.Builder routingTableBuilder = RoutingTable.builder();
         for (int i = 0; i < numberOfIndices; i++) {
             String indexName = randomAlphaOfLength(randomIntBetween(1, 50));
-            final Index index = new Index(indexName, "uuid");
             final IndexMetadata indexMetadata = new IndexMetadata.Builder(indexName).settings(
                 Settings.builder()
                     .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
@@ -751,7 +748,7 @@ private ClusterState createClusterState(String indexName) {
                 .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
                 .put(IndexMetadata.SETTING_INDEX_UUID, "uuid")
                 .build()
-        ).numberOfShards(randomInt(1000)).numberOfReplicas(randomInt(10)).build();
+        ).numberOfShards(between(1, 1000)).numberOfReplicas(randomInt(10)).build();
         RoutingTable routingTable = RoutingTable.builder().addAsNew(indexMetadata).build();
         return ClusterState.builder(ClusterName.DEFAULT)
             .routingTable(routingTable)