better thread naming

hibnico · Jun 23, 2012 · 885fc16 · 885fc16
1 parent 7ca460d
commit 885fc16
Show file tree

Hide file tree

Showing 40 changed files with 100 additions and 264 deletions.
diff --git a/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java b/src/main/java/org/elasticsearch/bootstrap/Bootstrap.java
@@ -224,7 +224,7 @@ public void run() {
                         // bail out
                     }
                 }
-            }, "es[keepAlive]");
+            }, "elasticsearch[keepAlive]");
             keepAliveThread.setDaemon(false);
             keepAliveThread.start();
         } catch (Throwable e) {

diff --git a/src/main/java/org/elasticsearch/client/transport/TransportClient.java b/src/main/java/org/elasticsearch/client/transport/TransportClient.java
@@ -57,8 +57,8 @@
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.settings.SettingsModule;
-import org.elasticsearch.common.thread.ThreadLocals;
 import org.elasticsearch.common.transport.TransportAddress;
+import org.elasticsearch.common.util.concurrent.ThreadLocals;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.env.EnvironmentModule;
 import org.elasticsearch.monitor.MonitorService;

diff --git a/src/main/java/org/elasticsearch/common/Unicode.java b/src/main/java/org/elasticsearch/common/Unicode.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.common;
 
 import org.apache.lucene.util.UnicodeUtil;
-import org.elasticsearch.common.thread.ThreadLocals;
+import org.elasticsearch.common.util.concurrent.ThreadLocals;
 
 import java.util.Arrays;
 

diff --git a/src/main/java/org/elasticsearch/common/netty/NettyStaticSetup.java b/src/main/java/org/elasticsearch/common/netty/NettyStaticSetup.java
@@ -0,0 +1,37 @@
+package org.elasticsearch.common.netty;
+
+import org.elasticsearch.transport.netty.NettyInternalESLoggerFactory;
+import org.jboss.netty.logging.InternalLogger;
+import org.jboss.netty.logging.InternalLoggerFactory;
+import org.jboss.netty.util.ThreadNameDeterminer;
+import org.jboss.netty.util.ThreadRenamingRunnable;
+
+/**
+ */
+public class NettyStaticSetup {
+
+    private static EsThreadNameDeterminer ES_THREAD_NAME_DETERMINER = new EsThreadNameDeterminer();
+
+    public static class EsThreadNameDeterminer implements ThreadNameDeterminer {
+        @Override
+        public String determineThreadName(String currentThreadName, String proposedThreadName) throws Exception {
+            // we control the thread name with a context, so use both
+            return currentThreadName + "{" + proposedThreadName + "}";
+        }
+    }
+
+    static {
+        InternalLoggerFactory.setDefaultFactory(new NettyInternalESLoggerFactory() {
+            @Override
+            public InternalLogger newInstance(String name) {
+                return super.newInstance(name.replace("org.jboss.netty.", "netty.").replace("org.jboss.netty.", "netty."));
+            }
+        });
+
+        ThreadRenamingRunnable.setThreadNameDeterminer(ES_THREAD_NAME_DETERMINER);
+    }
+
+    public static void setup() {
+
+    }
+}
diff --git a/src/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java b/src/main/java/org/elasticsearch/common/thread/ThreadNameDeterminer.java
diff --git a/src/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java b/src/main/java/org/elasticsearch/common/thread/ThreadRenamingRunnable.java
diff --git a/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java b/src/main/java/org/elasticsearch/common/util/concurrent/EsExecutors.java
@@ -23,6 +23,7 @@
 import org.elasticsearch.common.settings.Settings;
 
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  *
@@ -56,44 +57,37 @@ public static String threadName(Settings settings, String namePrefix) {
         } else {
             name = "elasticsearch[" + name + "]";
         }
-        return name + namePrefix;
+        return name + "[" + namePrefix + "]";
     }
 
     public static ThreadFactory daemonThreadFactory(Settings settings, String namePrefix) {
         return daemonThreadFactory(threadName(settings, namePrefix));
     }
 
-    /**
-     * A priority based thread factory, for all Thread priority constants:
-     * <tt>Thread.MIN_PRIORITY, Thread.NORM_PRIORITY, Thread.MAX_PRIORITY</tt>;
-     * <p/>
-     * This factory is used instead of Executers.DefaultThreadFactory to allow
-     * manipulation of priority and thread owner name.
-     *
-     * @param namePrefix a name prefix for this thread
-     * @return a thread factory based on given priority.
-     */
     public static ThreadFactory daemonThreadFactory(String namePrefix) {
-        final ThreadFactory f = java.util.concurrent.Executors.defaultThreadFactory();
-        final String o = namePrefix + "-";
-
-        return new ThreadFactory() {
-            public Thread newThread(Runnable r) {
-                Thread t = f.newThread(r);
+        return new EsThreadFactory(namePrefix);
+    }
 
-                /*
-                 * Thread name: owner-pool-N-thread-M, where N is the sequence
-                 * number of this factory, and M is the sequence number of the
-                 * thread created by this factory.
-                 */
-                t.setName(o + t.getName());
+    static class EsThreadFactory implements ThreadFactory {
+        final ThreadGroup group;
+        final AtomicInteger threadNumber = new AtomicInteger(1);
+        final String namePrefix;
 
-                /* override default definition t.setDaemon(false); */
-                t.setDaemon(true);
+        public EsThreadFactory(String namePrefix) {
+            this.namePrefix = namePrefix;
+            SecurityManager s = System.getSecurityManager();
+            group = (s != null) ? s.getThreadGroup() :
+                    Thread.currentThread().getThreadGroup();
+        }
 
-                return t;
-            }
-        };
+        @Override
+        public Thread newThread(Runnable r) {
+            Thread t = new Thread(group, r,
+                    namePrefix + "[T#" + threadNumber.getAndIncrement() + "]",
+                    0);
+            t.setDaemon(true);
+            return t;
+        }
     }
 
     /**

diff --git a/...search/common/thread/LoggingRunnable.java → ...mmon/util/concurrent/LoggingRunnable.java b/...search/common/thread/LoggingRunnable.java → ...mmon/util/concurrent/LoggingRunnable.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.thread;
+package org.elasticsearch.common.util.concurrent;
 
 import org.elasticsearch.common.logging.ESLogger;
 

diff --git a/...ticsearch/common/thread/ThreadLocals.java → .../common/util/concurrent/ThreadLocals.java b/...ticsearch/common/thread/ThreadLocals.java → .../common/util/concurrent/ThreadLocals.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.thread;
+package org.elasticsearch.common.util.concurrent;
 
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;

diff --git a/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java b/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java
@@ -22,6 +22,7 @@
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.common.component.AbstractLifecycleComponent;
 import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.netty.NettyStaticSetup;
 import org.elasticsearch.common.netty.OpenChannelsHandler;
 import org.elasticsearch.common.network.NetworkService;
 import org.elasticsearch.common.network.NetworkUtils;
@@ -35,15 +36,12 @@
 import org.elasticsearch.http.*;
 import org.elasticsearch.http.HttpRequest;
 import org.elasticsearch.transport.BindTransportException;
-import org.elasticsearch.transport.netty.NettyInternalESLoggerFactory;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.channel.*;
 import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
 import org.jboss.netty.channel.socket.oio.OioServerSocketChannelFactory;
 import org.jboss.netty.handler.codec.http.*;
 import org.jboss.netty.handler.timeout.ReadTimeoutException;
-import org.jboss.netty.logging.InternalLogger;
-import org.jboss.netty.logging.InternalLoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -60,12 +58,7 @@
 public class NettyHttpServerTransport extends AbstractLifecycleComponent<HttpServerTransport> implements HttpServerTransport {
 
     static {
-        InternalLoggerFactory.setDefaultFactory(new NettyInternalESLoggerFactory() {
-            @Override
-            public InternalLogger newInstance(String name) {
-                return super.newInstance(name.replace("org.jboss.netty.", "netty.").replace("org.jboss.netty.", "netty."));
-            }
-        });
+        NettyStaticSetup.setup();
     }
 
     private final NetworkService networkService;

diff --git a/src/main/java/org/elasticsearch/index/field/data/FieldData.java b/src/main/java/org/elasticsearch/index/field/data/FieldData.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.index.field.data;
 
 import org.apache.lucene.index.IndexReader;
-import org.elasticsearch.common.thread.ThreadLocals;
+import org.elasticsearch.common.util.concurrent.ThreadLocals;
 
 import java.io.IOException;
 

diff --git a/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java b/src/main/java/org/elasticsearch/index/field/data/bytes/MultiValueByteFieldData.java
@@ -20,7 +20,7 @@
 package org.elasticsearch.index.field.data.bytes;
 
 import org.elasticsearch.common.RamUsage;
-import org.elasticsearch.common.thread.ThreadLocals;
+import org.elasticsearch.common.util.concurrent.ThreadLocals;
 import org.elasticsearch.index.field.data.doubles.DoubleFieldData;
 
 /**