Handle 0 doc count segments

Signed-off-by: Suraj Singh <surajrider@gmail.com>
opensearch-project · Jun 26, 2023 · 4de7ebc · 4de7ebc
1 parent a2fea06
commit 4de7ebc
Showing 1 changed file with 11 additions and 4 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
@@ -99,20 +99,27 @@ private void waitForSearchableDocs(String index, int shardCount, int replicaCoun
             Response segrepStatsResponse = client().performRequest(segrepStatsRequest);
             logger.info("--> _cat/segments response\n {}", EntityUtils.toString(segrepStatsResponse.getEntity()));
             List<String> responseList = Streams.readAllLines(segrepStatsResponse.getEntity().getContent());
-            for (int primaryIndex=0; primaryIndex < responseList.size(); primaryIndex+=replicaCount+1) {
-                String[] primaryRow = responseList.get(primaryIndex).split(" +");
+            for (int segmentsIndex=0; segmentsIndex < responseList.size();) {
+                String[] primaryRow = responseList.get(segmentsIndex++).split(" +");
                 String shardId = primaryRow[0] + primaryRow[1];
                 assertTrue(primaryRow[2].equals("p"));
-                for(int replicaIdx = 1; replicaIdx <= replicaCount; replicaIdx++) {
-                    String[] replicaRow = responseList.get(primaryIndex + replicaIdx).split(" +");
+                for(int replicaIndex = 1; replicaIndex <= replicaCount; replicaIndex++) {
+                    String[] replicaRow = responseList.get(segmentsIndex).split(" +");
                     String replicaShardId = replicaRow[0] + replicaRow[1];
+                    // When segment has 0 doc count, not all replica copies posses that segment. Skip to next segment
+                    if (replicaRow[2].equals("p")) {
+                        assertTrue(primaryRow[4].equals("0"));
+                        break;
+                    }
+                    // verify same shard id
                     assertTrue(replicaShardId.equals(shardId));
                     // verify replica row
                     assertTrue(replicaRow[2].equals("r"));
                     // Verify segment name matches e.g. _0
                     assertTrue(replicaRow[3].equals(primaryRow[3]));
                     // Verify doc count matches
                     assertTrue(replicaRow[4].equals(primaryRow[4]));
+                    segmentsIndex++;
                 }
             }
         });