diff options
author | Tim Brooks <tim@uncontended.net> | 2017-06-29 15:16:07 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-29 15:16:07 -0500 |
commit | cac2eec7d298f5e3fcafde73bb975028bfd36741 (patch) | |
tree | 30cfa43f620c2b3227575246dc0e39d082b2db67 /core/src/main/java/org/elasticsearch | |
parent | c32c21e875f00a175863c8c0033c2599dcf9bf78 (diff) |
Add NioTransport threads to thread name checks (#25477)
We have various assertions that check we never block on transport
threads. This commit adds the thread names for the NioTransport to
these assertions.
With this change I had to fix two places where we were calling blocking
methods from the transport threads.
Diffstat (limited to 'core/src/main/java/org/elasticsearch')
-rw-r--r-- | core/src/main/java/org/elasticsearch/transport/Transports.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/main/java/org/elasticsearch/transport/Transports.java b/core/src/main/java/org/elasticsearch/transport/Transports.java index c7a0fe4d4f..d07846835c 100644 --- a/core/src/main/java/org/elasticsearch/transport/Transports.java +++ b/core/src/main/java/org/elasticsearch/transport/Transports.java @@ -29,6 +29,9 @@ public enum Transports { /** threads whose name is prefixed by this string will be considered network threads, even though they aren't */ public static final String TEST_MOCK_TRANSPORT_THREAD_PREFIX = "__mock_network_thread"; + public static final String NIO_TRANSPORT_WORKER_THREAD_NAME_PREFIX = "es_nio_transport_worker"; + public static final String NIO_TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX = "es_nio_transport_acceptor"; + /** * Utility method to detect whether a thread is a network thread. Typically * used in assertions to make sure that we do not call blocking code from @@ -40,7 +43,9 @@ public enum Transports { HttpServerTransport.HTTP_SERVER_WORKER_THREAD_NAME_PREFIX, TcpTransport.TRANSPORT_SERVER_WORKER_THREAD_NAME_PREFIX, TcpTransport.TRANSPORT_CLIENT_BOSS_THREAD_NAME_PREFIX, - TEST_MOCK_TRANSPORT_THREAD_PREFIX)) { + TEST_MOCK_TRANSPORT_THREAD_PREFIX, + NIO_TRANSPORT_WORKER_THREAD_NAME_PREFIX, + NIO_TRANSPORT_ACCEPTOR_THREAD_NAME_PREFIX)) { if (threadName.contains(s)) { return true; } |