Use cause to determine if node with primary is closing.

Backport of elastic/elasticsearch#39723
crate · Sep 4, 2019 · 26047d3 · 26047d3
1 parent c3406a9
commit 26047d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...rver/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java b/...rver/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java
@@ -202,8 +202,11 @@ public void onFailure(Exception replicaException) {
     }
 
     private void onNoLongerPrimary(Exception failure) {
-        final boolean nodeIsClosing = failure instanceof NodeClosedException ||
-            (failure instanceof TransportException && "TransportService is closed stopped can't send request".equals(failure.getMessage()));
+        final Throwable cause = ExceptionsHelper.unwrapCause(failure);
+        final boolean nodeIsClosing =
+            cause instanceof NodeClosedException ||
+            (cause instanceof TransportException && "TransportService is closed stopped can't send request".equals(cause.getMessage()));
+
         final String message;
         if (nodeIsClosing) {
             message = String.format(Locale.ROOT,

diff --git a/...src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java b/...src/test/java/org/elasticsearch/action/support/replication/ReplicationOperationTests.java
@@ -43,6 +43,7 @@
 import org.elasticsearch.index.shard.ShardId;
 import org.elasticsearch.node.NodeClosedException;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.transport.SendRequestTransportException;
 import org.elasticsearch.transport.TransportException;
 import org.junit.Test;
 
@@ -207,7 +208,9 @@ public void testNoLongerPrimary() throws Exception {
         if (randomBoolean()) {
             shardActionFailure = new NodeClosedException(new DiscoveryNode("foo", buildNewFakeTransportAddress(), Version.CURRENT));
         } else if (randomBoolean()) {
-            shardActionFailure = new TransportException("TransportService is closed stopped can't send request");
+            shardActionFailure = new SendRequestTransportException(
+                new DiscoveryNode("foo", buildNewFakeTransportAddress(), Version.CURRENT), "internal:cluster/shard/failure",
+                new TransportException("TransportService is closed stopped can't send request"));
         } else {
             shardActionFailure = new ShardStateAction.NoLongerPrimaryShardException(failedReplica.shardId(), "the king is dead");
         }