add name to threadpools threads

Author: oshai

.classpath

@@ -43,11 +43,6 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -65,5 +60,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -6,6 +6,7 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annota
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7

src/common/codeine/executer/ThreadPoolUtils.java

@@ -1,18 +1,31 @@
 package codeine.executer;
 
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
 public class ThreadPoolUtils {
 
 	private static final int CAPACITY = 1000;
 
-	public static ThreadPoolExecutor newThreadPool(int maximumNumOfThreads){
+	public static ThreadPoolExecutor newThreadPool(int maximumNumOfThreads, String poolName){
 		BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>(CAPACITY);
-		ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(maximumNumOfThreads, maximumNumOfThreads, 1, TimeUnit.SECONDS , workQueue);
+		ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(maximumNumOfThreads, maximumNumOfThreads, 1, TimeUnit.SECONDS , workQueue, createFactory(poolName));
 		threadPoolExecutor.allowCoreThreadTimeOut(true);
 		return threadPoolExecutor;
 	}
+	//TODO I think it is better to use this version and eliminate the other one
+	//need to check more about allowCoreThreadTimeOut and assert Error id above amount of tasks
+	public static ExecutorService newFixedThreadPool(int concurrency, String poolName) {
+		return Executors.newFixedThreadPool(concurrency,createFactory(poolName));
+	}
+	private static ThreadFactory createFactory(String poolName) {
+		return new ThreadFactoryBuilder().setNameFormat(poolName+"-%d").build();
+	}
 }

src/common/codeine/jsons/CommandExecutionStatusInfo.java

@@ -130,4 +130,8 @@ public String toString() {
 				+ ", finished=" + finished + "]";
 	}
 
+	public String command_name() {
+		return command();
+	}
+
 }

src/common/codeine/jsons/peer_status/PeersProjectsStatusInWebServer.java

@@ -5,7 +5,6 @@
 import java.util.Map.Entry;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
 
@@ -15,6 +14,7 @@
 
 import codeine.db.IStatusDatabaseConnector;
 import codeine.db.mysql.connectors.StatusDatabaseConnectorListProvider;
+import codeine.utils.ThreadUtils;
 
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Lists;
@@ -66,7 +66,7 @@ private List<Map<String, PeerStatusJsonV2>> getUpdateMaps() {
 		List<FutureTask<Map<String, PeerStatusJsonV2>>> futures = Lists.newArrayList();
 		List<IStatusDatabaseConnector> providers = statusDatabaseConnectorListProvider.get();
 		log.info("will get update concurrent with pool size " + providers.size());
-		ExecutorService executor = Executors.newFixedThreadPool(providers.size());
+		ExecutorService executor = ThreadUtils.newFixedThreadPool(providers.size(), "PeersProjectsStatus");
 		for (final IStatusDatabaseConnector c : providers) {
 			FutureTask<Map<String, PeerStatusJsonV2>> future = new FutureTask<Map<String, PeerStatusJsonV2>>(new Callable<Map<String,PeerStatusJsonV2>>() {
 				@Override

src/common/codeine/utils/ThreadUtils.java

@@ -1,5 +1,9 @@
 package codeine.utils;
 
+import java.util.concurrent.ExecutorService;
+
+import codeine.executer.ThreadPoolUtils;
+
 
 
 public class ThreadUtils {
@@ -29,4 +33,8 @@ public static Thread createThread(Runnable runnable) {
 	public static Thread createThread(Runnable runnable, String threadName) {
 		return new Thread(runnable, threadName);
 	}
+	
+	public static ExecutorService newFixedThreadPool(int concurrency, String poolName) {
+		return ThreadPoolUtils.newFixedThreadPool(concurrency, poolName);
+	}
 }

src/web_server/codeine/ConfigurationManagerServer.java

@@ -71,7 +71,7 @@ private ThreadPoolExecutor getUpdateThreadPool(String key) {
 			return dbUpdateThreadsMap.get(key, new Callable<ThreadPoolExecutor>() {
 				@Override
 				public ThreadPoolExecutor call() throws Exception {
-					return ThreadPoolUtils.newThreadPool(NUM_OF_THREADS_FOR_EACH_DB);
+					return ThreadPoolUtils.newThreadPool(NUM_OF_THREADS_FOR_EACH_DB, "ConfigurationManagerServer-DB-Update");
 				}
 			});
 		} catch (ExecutionException e) {

src/web_server/codeine/ProjectConfigurationInPeerUpdater.java

@@ -35,7 +35,7 @@ public class ProjectConfigurationInPeerUpdater{
 	@Inject	private PeersProjectsStatus peersProjectsStatus;
 	@Inject	private NodeGetter nodeGetter;
 	@Inject	private Links links;
-	private ThreadPoolExecutor threadPool = ThreadPoolUtils.newThreadPool(10);
+	private ThreadPoolExecutor threadPool = ThreadPoolUtils.newThreadPool(10, "ProjectConfigurationInPeerUpdater");
 
 
 	private void sendUpdateToPeers(Collection<PeerStatusJsonV2> allPeers) {

src/web_server/codeine/command_peer/AllNodesCommandExecuter.java

@@ -296,4 +296,8 @@ public Object fileWriteSync() {
 	public CommandExecutionStatusInfo commandExecutionInfo() {
 		return commandExecutionInfo;
 	}
+
+	public String commandString() {
+		return commandExecutionInfo().project_name() + "/" + commandExecutionInfo().command_name() + "/" + commandExecutionInfo().id();
+	}
 }

src/web_server/codeine/command_peer/CommandExecutionStrategy.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 import org.apache.log4j.Logger;
 
@@ -11,6 +10,7 @@
 import codeine.configuration.Links;
 import codeine.jsons.project.ProjectJson;
 import codeine.permissions.IUserWithPermissions;
+import codeine.utils.ThreadUtils;
 
 public abstract class CommandExecutionStrategy {
 
@@ -58,7 +58,7 @@ protected void executeConcurrent(List<NodeWithPeerInfo> nodes, int concurrency)
 			writeLine("concurrency is above limit, will reduce it to " + MAX_NODES_TO_EXECUTE);
 			concurrency = MAX_NODES_TO_EXECUTE;
 		}
-		ExecutorService executor = Executors.newFixedThreadPool(concurrency);
+		ExecutorService executor = ThreadUtils.newFixedThreadPool(concurrency, "CommandExecution-" + allNodesCommandExecuter.commandString());
 		for (NodeWithPeerInfo peer : nodes) {
 			commandNode(executor, peer, shouldOutputImmediatly);
 		}

src/web_server/codeine/command_peer/PeerCommandWorker.java

@@ -76,7 +76,7 @@ private void execute() {
 
 	private void executeInternal() {
 		String url = links.getPeerLink(node.peer_address()) + Constants.COMMAND_NODE_CONTEXT;
-		log.info("commandNode " + command_info.project_name() + "/" + command_info.command_name() + "/" + executionInfo.id() + " for " + node.alias() + " url is " + url);
+		log.info("commandNode " + allNodesCommandExecuter.commandString() + " for " + node.alias() + " url is " + url);
 		try {
 			ThreadUtils.sleep(getSleepTime());
 			log.debug("running worker " + node);

src/web_server/codeine/plugins/DiscardOldCommandsPlugin.java

@@ -24,7 +24,7 @@ public class DiscardOldCommandsPlugin {
 
 	@Inject	private PathHelper pathHelper;
 	@Inject	private Gson gson;
-	private ThreadPoolExecutor executor = ThreadPoolUtils.newThreadPool(2);
+	private ThreadPoolExecutor executor = ThreadPoolUtils.newThreadPool(2, "DiscardOldCommandsPlugin");
 
 	public void queueForDelete(final ProjectJson project) {
 		if (!project.discard_old_commands().enabled()) {