Address comments.

Signed-off-by: Rishikesh1159 <rishireddy1159@gmail.com>
opensearch-project · Mar 9, 2023 · f285ba3 · f285ba3
1 parent 0a79735
commit f285ba3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/opensearch/action/bulk/TransportShardBulkAction.java
@@ -793,6 +793,7 @@ protected long replicaOperationSize(BulkShardRequest request) {
     public static Tuple<Translog.Location, Long> performOnReplica(BulkShardRequest request, IndexShard replica) throws Exception {
         Translog.Location location = null;
         long maxSeqNo = SequenceNumbers.NO_OPS_PERFORMED;
+        final boolean isSegRepEnabled = replica.indexSettings().isSegRepEnabled();
         for (int i = 0; i < request.items().length; i++) {
             final BulkItemRequest item = request.items()[i];
             final BulkItemResponse response = item.getPrimaryResponse();
@@ -814,14 +815,18 @@ public static Tuple<Translog.Location, Long> performOnReplica(BulkShardRequest r
                     primaryTerm,
                     response.getFailure().getMessage()
                 );
-                maxSeqNo = Math.max(response.getFailure().getSeqNo(), maxSeqNo);
+                if (isSegRepEnabled) {
+                    maxSeqNo = Math.max(response.getFailure().getSeqNo(), maxSeqNo);
+                }
             } else {
                 if (response.getResponse().getResult() == DocWriteResponse.Result.NOOP) {
                     continue; // ignore replication as it's a noop
                 }
                 assert response.getResponse().getSeqNo() != SequenceNumbers.UNASSIGNED_SEQ_NO;
                 operationResult = performOpOnReplica(response.getResponse(), item.request(), replica);
-                maxSeqNo = Math.max(response.getResponse().getSeqNo(), maxSeqNo);
+                if (isSegRepEnabled) {
+                    maxSeqNo = Math.max(response.getResponse().getSeqNo(), maxSeqNo);
+                }
             }
             assert operationResult != null : "operation result must never be null when primary response has no failure";
             location = syncOperationResultOrThrow(operationResult, location);

diff --git a/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java b/server/src/test/java/org/opensearch/index/shard/RefreshListenersTests.java
@@ -119,7 +119,7 @@ public void setupListeners() throws Exception {
             logger,
             threadPool.getThreadContext(),
             refreshMetric,
-            this::returnSeqNo
+            () -> 10L
         );
 
         IndexSettings indexSettings = IndexSettingsModule.newIndexSettings("index", Settings.EMPTY);
@@ -181,10 +181,6 @@ public void tearDownListeners() throws Exception {
         terminate(threadPool);
     }
 
-    public Long returnSeqNo() {
-        return 10L;
-    }
-
     public void testBeforeRefresh() throws Exception {
         assertEquals(0, listeners.pendingCount());
         Engine.IndexResult index = index("1");