honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also catch EsRejectedExecutionException next to 

RejectedExcecutionException
This commit is contained in:
Simon Willnauer 2013-08-12 21:25:40 +02:00
parent bc0abd8226
commit c6a803b677
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/elasticsearch/discovery/zen/ping/unicast/UnicastZenPing.java
View File

@ -36,6 +36,7 @@ import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.util.concurrent.EsExecutors; 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.DiscoveryNodesProvider;
import org.elasticsearch.discovery.zen.ping.ZenPing; import org.elasticsearch.discovery.zen.ping.ZenPing;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
@ -187,11 +188,15 @@ public class UnicastZenPing extends AbstractLifecycleComponent<ZenPing> implemen
listener.onPing(responses.values().toArray(new PingResponse[responses.size()])); listener.onPing(responses.values().toArray(new PingResponse[responses.size()]));
} catch (RejectedExecutionException ex) { } catch (RejectedExecutionException ex) {
logger.debug("Ping execution rejected", ex); logger.debug("Ping execution rejected", ex);
} catch (EsRejectedExecutionException ex) {
logger.debug("Ping execution rejected", ex);
} }
} }
}); });
} catch (RejectedExecutionException ex) { } catch (RejectedExecutionException ex) {
logger.debug("Ping execution rejected", ex); logger.debug("Ping execution rejected", ex);
} catch (EsRejectedExecutionException ex) {
logger.debug("Ping execution rejected", ex);
} }
} }
}); });

3
src/main/java/org/elasticsearch/transport/TransportService.java
View File

@ -32,6 +32,7 @@ import org.elasticsearch.common.transport.BoundTransportAddress;
import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.transport.TransportAddress;
import org.elasticsearch.common.util.concurrent.ConcurrentCollections; import org.elasticsearch.common.util.concurrent.ConcurrentCollections;
import org.elasticsearch.common.util.concurrent.ConcurrentMapLong; import org.elasticsearch.common.util.concurrent.ConcurrentMapLong;
import org.elasticsearch.common.util.concurrent.EsRejectedExecutionException;
import org.elasticsearch.threadpool.ThreadPool; import org.elasticsearch.threadpool.ThreadPool;
import java.util.Collections; import java.util.Collections;
@ -316,6 +317,8 @@ public class TransportService extends AbstractLifecycleComponent<TransportServic
} }
} catch (RejectedExecutionException ex) { } catch (RejectedExecutionException ex) {
logger.debug("Rejected execution on NodeDisconnected", ex); logger.debug("Rejected execution on NodeDisconnected", ex);
} catch (EsRejectedExecutionException ex) {
logger.debug("Rejected execution on NodeDisconnected", ex);
} }
} }
}); });