Resolve listener passed to WriteActionReplicasProxy#failShardIfNeeded…

… when replica not failed Signed-off-by: Marc Handalian <[email protected]>
opensearch-project · Feb 6, 2024 · cbe8679 · cbe8679
1 parent 3cbf54e
commit cbe8679
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java b/server/src/main/java/org/opensearch/action/support/replication/TransportWriteAction.java
@@ -586,6 +586,8 @@ public void failShardIfNeeded(
                     exception,
                     listener
                 );
+            } else {
+                listener.onResponse(null);
             }
         }
 

diff --git a/...er/src/test/java/org/opensearch/action/support/replication/TransportWriteActionTests.java b/...er/src/test/java/org/opensearch/action/support/replication/TransportWriteActionTests.java
@@ -440,8 +440,10 @@ public void testPrimaryClosedDoesNotFailShard() {
                 new PrimaryShardClosedException(shardId),
                 ActionListener.wrap(callbackCount::incrementAndGet)
             );
+        // emptyArray ensures no failure call is invoked
         MatcherAssert.assertThat(transport.getCapturedRequestsAndClear(), emptyArray());
-        MatcherAssert.assertThat(callbackCount.get(), equalTo(0));
+        // listener should get invoked
+        MatcherAssert.assertThat(callbackCount.get(), equalTo(1));
     }
 
     private class TestAction extends TransportWriteAction<TestRequest, TestRequest, TestResponse> {