Merge pull request #15212 from ywelsch/fix/rejectedexecution-on-shutdown

Ignore RejectedExecutionException in NodesFaultDetection
This commit is contained in:
Yannick Welsch 2015-12-04 16:36:08 +01:00
commit 1905f495bf

View File

@ -26,6 +26,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.*; import org.elasticsearch.transport.*;
@ -145,6 +146,7 @@ public class NodesFaultDetection extends FaultDetection {
} }
private void notifyNodeFailure(final DiscoveryNode node, final String reason) { private void notifyNodeFailure(final DiscoveryNode node, final String reason) {
try {
threadPool.generic().execute(new Runnable() { threadPool.generic().execute(new Runnable() {
@Override @Override
public void run() { public void run() {
@ -153,6 +155,9 @@ public class NodesFaultDetection extends FaultDetection {
} }
} }
}); });
} catch (EsRejectedExecutionException ex) {
logger.trace("[node ] [{}] ignoring node failure (reason [{}]). Local node is shutting down", ex, node, reason);
}
} }
private void notifyPingReceived(final PingRequest pingRequest) { private void notifyPingReceived(final PingRequest pingRequest) {