Merge branch 'main' into search-template-fix

opensearch-project · Aug 9, 2023 · 7b927ce · 7b927ce
2 parents a6d5560 + b2af655
commit 7b927ce
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 27 deletions.
diff --git a/server/src/internalClusterTest/java/org/opensearch/search/SearchWeightedRoutingIT.java b/server/src/internalClusterTest/java/org/opensearch/search/SearchWeightedRoutingIT.java
@@ -1090,6 +1090,7 @@ public void testMultiGetWithNetworkDisruption_FailOpenDisabled() throws Exceptio
     /**
      * Assert that preference search with custom string doesn't hit a node in weighed away az
      */
+    @AwaitsFix(bugUrl = "https://github.com/opensearch-project/OpenSearch/issues/8030")
     public void testStrictWeightedRoutingWithCustomString() {
         Settings commonSettings = Settings.builder()
             .put("cluster.routing.allocation.awareness.attributes", "zone")

diff --git a/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java b/server/src/test/java/org/opensearch/snapshots/SnapshotResiliencyTests.java
@@ -798,43 +798,41 @@ public void testTransportGetSnapshotsAction() {
         setupTestCluster(randomFrom(1, 3, 5), randomIntBetween(2, 10));
 
         String repoName = "repo";
-        final String[] snapshotsList = { "snapshot-1", "snapshot-2" };
-        final String[] indexList = { "index-1", "index-2" };
+        final String[] snapshotsList = { "snapshot-1" };
+        final String index = "index-1";
         final int shards = randomIntBetween(1, 10);
 
         TestClusterNodes.TestClusterNode clusterManagerNode = testClusterNodes.currentClusterManager(
             testClusterNodes.nodes.values().iterator().next().clusterService.state()
         );
 
-        for (int i = 0; i < snapshotsList.length; i++) {
-            final StepListener<CreateSnapshotResponse> createSnapshotResponseStepListener = new StepListener<>();
-            final String snapshot = snapshotsList[i];
-            final String index = indexList[i];
-            continueOrDie(
-                createRepoAndIndex(repoName, index, shards),
-                createSnapshotResponse -> client().admin()
-                    .cluster()
-                    .prepareCreateSnapshot(repoName, snapshot)
-                    .setWaitForCompletion(true)
-                    .execute(createSnapshotResponseStepListener)
-            );
-        }
-        deterministicTaskQueue.runAllRunnableTasks();
+        final StepListener<CreateSnapshotResponse> createSnapshotResponseStepListener = new StepListener<>();
+        final String snapshot = snapshotsList[0];
+        continueOrDie(
+            createRepoAndIndex(repoName, index, shards),
+            createSnapshotResponse -> client().admin()
+                .cluster()
+                .prepareCreateSnapshot(repoName, snapshot)
+                .setWaitForCompletion(true)
+                .execute(createSnapshotResponseStepListener)
+        );
+
+        continueOrDie(createSnapshotResponseStepListener, createSnapshotResponse -> {
 
-        TransportAction getSnapshotsAction = clusterManagerNode.actions.get(GetSnapshotsAction.INSTANCE);
-        TransportGetSnapshotsAction transportGetSnapshotsAction = (TransportGetSnapshotsAction) getSnapshotsAction;
-        GetSnapshotsRequest repoSnapshotRequest = new GetSnapshotsRequest().repository(repoName).snapshots(snapshotsList);
+            TransportAction getSnapshotsAction = clusterManagerNode.actions.get(GetSnapshotsAction.INSTANCE);
+            TransportGetSnapshotsAction transportGetSnapshotsAction = (TransportGetSnapshotsAction) getSnapshotsAction;
+            GetSnapshotsRequest repoSnapshotRequest = new GetSnapshotsRequest().repository(repoName).snapshots(snapshotsList);
 
-        transportGetSnapshotsAction.execute(null, repoSnapshotRequest, ActionListener.wrap(repoSnapshotResponse -> {
-            assertNotNull("Snapshot list should not be null", repoSnapshotResponse.getSnapshots());
-            assertThat(repoSnapshotResponse.getSnapshots(), hasSize(2));
-            List<SnapshotInfo> snapshotInfos = repoSnapshotResponse.getSnapshots();
-            for (SnapshotInfo snapshotInfo : snapshotInfos) {
+            transportGetSnapshotsAction.execute(null, repoSnapshotRequest, ActionListener.wrap(repoSnapshotResponse -> {
+                assertNotNull("Snapshot list should not be null", repoSnapshotResponse.getSnapshots());
+                assertThat(repoSnapshotResponse.getSnapshots(), hasSize(1));
+                List<SnapshotInfo> snapshotInfos = repoSnapshotResponse.getSnapshots();
+                SnapshotInfo snapshotInfo = snapshotInfos.get(0);
                 assertEquals(SnapshotState.SUCCESS, snapshotInfo.state());
                 assertEquals(0, snapshotInfo.failedShards());
-                assertTrue(Arrays.stream(snapshotsList).anyMatch(snapshotInfo.snapshotId().getName()::equals));
-            }
-        }, exception -> { throw new AssertionError(exception); }));
+                assertEquals(snapshotInfo.snapshotId().getName(), snapshotsList[0]);
+            }, exception -> { throw new AssertionError(exception); }));
+        });
     }
 
     public void testTransportGetCurrentSnapshotsAction() {