Verify replica doc count only when it is assigned

Signed-off-by: Suraj Singh <surajrider@gmail.com>
opensearch-project · May 18, 2023 · 85f2f11 · 85f2f11
1 parent 5e76b2f
commit 85f2f11
Showing 1 changed file with 13 additions and 10 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
@@ -125,16 +125,19 @@ private void waitForSearchableDocs(String index, int shardCount) throws Exceptio
             final int primaryHits = ObjectPath.createFromResponse(searchTestIndexResponse).evaluate("hits.total");
             logger.info("--> primaryHits {}", primaryHits);
             final int shardNum = shardNumber;
-            assertBusy(() -> {
-                Request replicaRequest = new Request("POST", "/" + index + "/_search");
-                replicaRequest.addParameter(TOTAL_HITS_AS_INT_PARAM, "true");
-                replicaRequest.addParameter("filter_path", "hits.total");
-                replicaRequest.addParameter("preference", "_shards:" + shardNum + "|_only_nodes:" + replicaShardToNodeIDMap.get(shardNum));
-                Response replicaResponse = client().performRequest(replicaRequest);
-                int replicaHits = ObjectPath.createFromResponse(replicaResponse).evaluate("hits.total");
-                logger.info("--> ReplicaHits {}", replicaHits);
-                assertEquals(primaryHits, replicaHits);
-            }, 1, TimeUnit.MINUTES);
+            // Verify replica shard doc count only when available.
+            if (replicaShardToNodeIDMap.get(shardNum) != null) {
+                assertBusy(() -> {
+                    Request replicaRequest = new Request("POST", "/" + index + "/_search");
+                    replicaRequest.addParameter(TOTAL_HITS_AS_INT_PARAM, "true");
+                    replicaRequest.addParameter("filter_path", "hits.total");
+                    replicaRequest.addParameter("preference", "_shards:" + shardNum + "|_only_nodes:" + replicaShardToNodeIDMap.get(shardNum));
+                    Response replicaResponse = client().performRequest(replicaRequest);
+                    int replicaHits = ObjectPath.createFromResponse(replicaResponse).evaluate("hits.total");
+                    logger.info("--> ReplicaHits {}", replicaHits);
+                    assertEquals(primaryHits, replicaHits);
+                }, 1, TimeUnit.MINUTES);
+            }
         }
     }