Orderly shutdown with unicast discovery might cause the shutdown node…

… to still be part of the election process, closes #1740.
elastic · Feb 27, 2012 · 43e45a1 · 43e45a1
1 parent b0e0dd8
commit 43e45a1
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
@@ -23,6 +23,7 @@
 import jsr166y.LinkedTransferQueue;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ElasticSearchIllegalArgumentException;
+import org.elasticsearch.ElasticSearchIllegalStateException;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -342,6 +343,9 @@ public void handleException(TransportException exp) {
     }
 
     private UnicastPingResponse handlePingRequest(final UnicastPingRequest request) {
+        if (lifecycle.stoppedOrClosed()) {
+            throw new ElasticSearchIllegalStateException("received ping request while stopped/closed");
+        }
         temporalResponses.add(request.pingResponse);
         threadPool.schedule(TimeValue.timeValueMillis(request.timeout.millis() * 2), ThreadPool.Names.SAME, new Runnable() {
             @Override