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 index a7218dc41dc..9804cda131a 100644 --- a/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java +++ b/src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java @@ -36,6 +36,7 @@ import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.EsExecutors; +import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.discovery.zen.DiscoveryNodesProvider; import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.threadpool.ThreadPool; @@ -187,11 +188,15 @@ public class UnicastZenPing extends AbstractLifecycleComponent implemen listener.onPing(responses.values().toArray(new PingResponse[responses.size()])); } catch (RejectedExecutionException ex) { logger.debug("Ping execution rejected", ex); + } catch (EsRejectedExecutionException ex) { + logger.debug("Ping execution rejected", ex); } } }); } catch (RejectedExecutionException ex) { logger.debug("Ping execution rejected", ex); + } catch (EsRejectedExecutionException ex) { + logger.debug("Ping execution rejected", ex); } } }); diff --git a/src/main/java/org/elasticsearch/transport/TransportService.java b/src/main/java/org/elasticsearch/transport/TransportService.java index 6ebf70ba63c..57274347a83 100644 --- a/src/main/java/org/elasticsearch/transport/TransportService.java +++ b/src/main/java/org/elasticsearch/transport/TransportService.java @@ -32,6 +32,7 @@ import org.elasticsearch.common.transport.BoundTransportAddress; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.ConcurrentMapLong; +import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException; import org.elasticsearch.threadpool.ThreadPool; import java.util.Collections; @@ -316,6 +317,8 @@ public class TransportService extends AbstractLifecycleComponent