http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/config/load/dsi-load-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/dsi-load-base.xml b/modules/core/src/test/config/load/dsi-load-base.xml index 4ac4001..e75e190 100644 --- a/modules/core/src/test/config/load/dsi-load-base.xml +++ b/modules/core/src/test/config/load/dsi-load-base.xml @@ -71,7 +71,7 @@ <property name="deploymentMode" value="CONTINUOUS"/> <property name="executorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 4}"/> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 4}"/> <constructor-arg type="long"> @@ -84,7 +84,7 @@ </property> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 8}"/> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 8}"/> <constructor-arg type="long">
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/config/load/merge-sort-base.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/merge-sort-base.xml b/modules/core/src/test/config/load/merge-sort-base.xml index 6712024..130bfe3 100644 --- a/modules/core/src/test/config/load/merge-sort-base.xml +++ b/modules/core/src/test/config/load/merge-sort-base.xml @@ -57,7 +57,7 @@ <!-- Disable pools --> <property name="executorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="100"/> <constructor-arg type="int" value="100"/> <constructor-arg type="long"> @@ -70,7 +70,7 @@ </property> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="100"/> <constructor-arg type="int" value="100"/> <constructor-arg type="long"> @@ -83,7 +83,7 @@ </property> <property name="peerClassLoadingExecutorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="100"/> <constructor-arg type="int" value="100"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/config/load/mongo-multinode-foster.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/load/mongo-multinode-foster.xml b/modules/core/src/test/config/load/mongo-multinode-foster.xml index 9790871..3235a6f 100644 --- a/modules/core/src/test/config/load/mongo-multinode-foster.xml +++ b/modules/core/src/test/config/load/mongo-multinode-foster.xml @@ -115,7 +115,7 @@ <property name="peerClassLoadingEnabled" value="false"/> <property name="executorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 2}"/> <constructor-arg type="int" value="#{T(java.lang.Runtime).getRuntime().availableProcessors() * 2}"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/config/spring-multicache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/spring-multicache.xml b/modules/core/src/test/config/spring-multicache.xml index 13929f6..c60c6b3 100644 --- a/modules/core/src/test/config/spring-multicache.xml +++ b/modules/core/src/test/config/spring-multicache.xml @@ -288,7 +288,7 @@ All threads are pre-started and are available for use. --> <property name="executorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="10"/> <constructor-arg type="int" value="10"/> <constructor-arg type="long"> @@ -306,7 +306,7 @@ Threads are not started unless used. --> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="10"/> <constructor-arg type="int" value="10"/> <constructor-arg type="long"> @@ -324,7 +324,7 @@ Threads are not started unless used. --> <property name="peerClassLoadingExecutorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="2"/> <constructor-arg type="int" value="2"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index d417e13..2bfefff 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -80,9 +80,9 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb // c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(), // MyValue.class.getName()); - c.setExecutorService(new GridThreadPoolExecutor(10, 10, 0, new LinkedBlockingQueue<Runnable>())); - c.setSystemExecutorService(new GridThreadPoolExecutor(10, 10, 0, new LinkedBlockingQueue<Runnable>())); - c.setPeerClassLoadingExecutorService(new GridThreadPoolExecutor(3, 3, 0, new LinkedBlockingQueue<Runnable>())); + c.setExecutorService(new IgniteThreadPoolExecutor(10, 10, 0, new LinkedBlockingQueue<Runnable>())); + c.setSystemExecutorService(new IgniteThreadPoolExecutor(10, 10, 0, new LinkedBlockingQueue<Runnable>())); + c.setPeerClassLoadingExecutorService(new IgniteThreadPoolExecutor(3, 3, 0, new LinkedBlockingQueue<Runnable>())); c.setLifecycleBeans(lifecycleBean); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java index 9f6b1e4..af48d70 100644 --- a/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java +++ b/modules/core/src/test/java/org/gridgain/grid/marshaller/GridMarshallerResourceBean.java @@ -63,7 +63,7 @@ class GridMarshallerResourceBean implements Serializable { marshaller = new IgniteJdkMarshaller(); mbeanSrv = ManagementFactory.getPlatformMBeanServer(); ses = new GridTestTaskSession(); - execSvc = new GridThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); + execSvc = new IgniteThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); appCtx = new GenericApplicationContext(); jobCtx = new GridTestJobContext(); balancer = new LoadBalancer(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java index 1ee02fc..469014b 100644 --- a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadPoolExecutorServiceSelfTest.java @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.*; import static java.util.concurrent.TimeUnit.*; /** - * Test for {@link GridThreadPoolExecutor}. + * Test for {@link IgniteThreadPoolExecutor}. */ @GridCommonTest(group = "Utils") public class GridThreadPoolExecutorServiceSelfTest extends GridCommonAbstractTest { @@ -49,7 +49,7 @@ public class GridThreadPoolExecutorServiceSelfTest extends GridCommonAbstractTes * @throws Exception If failed. */ public void testSingleGridThreadExecutor() throws Exception { - ExecutorService exec = Executors.newSingleThreadExecutor(new GridThreadFactory("gridName")); + ExecutorService exec = Executors.newSingleThreadExecutor(new IgniteThreadFactory("gridName")); exec.submit(new InterruptingRunnable()).get(); @@ -70,7 +70,7 @@ public class GridThreadPoolExecutorServiceSelfTest extends GridCommonAbstractTes * @throws ExecutionException If failed. */ public void testGridThreadPoolExecutor() throws Exception { - GridThreadPoolExecutor exec = new GridThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); + IgniteThreadPoolExecutor exec = new IgniteThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); exec.submit(new InterruptingRunnable()).get(); @@ -86,7 +86,7 @@ public class GridThreadPoolExecutorServiceSelfTest extends GridCommonAbstractTes * @throws ExecutionException If failed. */ public void testGridThreadPoolExecutorRejection() throws Exception { - GridThreadPoolExecutor exec = new GridThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); + IgniteThreadPoolExecutor exec = new IgniteThreadPoolExecutor(1, 1, 0, new LinkedBlockingQueue<Runnable>()); for (int i = 0; i < 10; i++) exec.submit(new TestRunnable()); @@ -104,7 +104,7 @@ public class GridThreadPoolExecutorServiceSelfTest extends GridCommonAbstractTes final CountDownLatch startLatch = new CountDownLatch(THREAD_CNT); final CountDownLatch stopLatch = new CountDownLatch(THREAD_CNT); - GridThreadPoolExecutor exec = new GridThreadPoolExecutor( + IgniteThreadPoolExecutor exec = new IgniteThreadPoolExecutor( THREAD_CNT, THREAD_CNT, Long.MAX_VALUE, new LinkedBlockingQueue<Runnable>(), new ThreadFactory() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java index 770d2f7..f99ceae 100644 --- a/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/thread/GridThreadTest.java @@ -14,7 +14,7 @@ import org.gridgain.testframework.junits.common.*; import java.util.*; /** - * Test for {@link GridThread}. + * Test for {@link IgniteThread}. */ @GridCommonTest(group = "Utils") public class GridThreadTest extends GridCommonAbstractTest { @@ -25,20 +25,20 @@ public class GridThreadTest extends GridCommonAbstractTest { * @throws Exception If failed. */ public void testAssertion() throws Exception { - Collection<GridThread> ts = new ArrayList<>(); + Collection<IgniteThread> ts = new ArrayList<>(); for (int i = 0; i < THREAD_CNT; i++) { - ts.add(new GridThread("test-grid-" + i, "test-thread", new Runnable() { + ts.add(new IgniteThread("test-grid-" + i, "test-thread", new Runnable() { @Override public void run() { assert false : "Expected assertion."; } })); } - for (GridThread t : ts) + for (IgniteThread t : ts) t.start(); - for (GridThread t : ts) + for (IgniteThread t : ts) t.join(); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java index 6644d6e..2264ced 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -114,8 +114,8 @@ public class GridCacheSingleNodeLoadTest { c.setCollisionSpi(cols); - c.setExecutorService(new GridThreadPoolExecutor(THREADS / 2, THREADS / 2, 0L, new LinkedBlockingQueue<Runnable>())); - c.setSystemExecutorService(new GridThreadPoolExecutor(THREADS * 2, THREADS * 2, 0L, + c.setExecutorService(new IgniteThreadPoolExecutor(THREADS / 2, THREADS / 2, 0L, new LinkedBlockingQueue<Runnable>())); + c.setSystemExecutorService(new IgniteThreadPoolExecutor(THREADS * 2, THREADS * 2, 0L, new LinkedBlockingQueue<Runnable>())); GridCacheConfiguration cc = new GridCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java index c6b4979..900e418 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/GridTestMain.java @@ -111,7 +111,7 @@ public class GridTestMain { private static void localPoolRun() { X.println("Local thread pool run..."); - ExecutorService exe = new GridThreadPoolExecutor(400, 400, 0, new ArrayBlockingQueue<Runnable>(400) { + ExecutorService exe = new IgniteThreadPoolExecutor(400, 400, 0, new ArrayBlockingQueue<Runnable>(400) { @Override public boolean offer(Runnable runnable) { try { put(runnable); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml index bd1e0eb..e0c8cc8 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml +++ b/modules/core/src/test/java/org/gridgain/loadtests/colocation/spring-colocation.xml @@ -70,7 +70,7 @@ All threads are pre-started and are available for use. --> <property name="executorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="400"/> <constructor-arg type="int" value="400"/> <constructor-arg type="long"> @@ -88,7 +88,7 @@ Threads are not started unless used. --> <property name="systemExecutorService"> - <bean class="org.gridgain.grid.thread.GridThreadPoolExecutor"> + <bean class="org.gridgain.grid.thread.IgniteThreadPoolExecutor"> <constructor-arg type="int" value="400"/> <constructor-arg type="int" value="400"/> <constructor-arg type="long"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java index 383424a..4c3dc2f 100644 --- a/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java +++ b/modules/core/src/test/java/org/gridgain/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java @@ -54,7 +54,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo // Set up new executor service because we have 1 per test and thus all // nodes have the same executor service. As soon as node get stopped // it stops executor service and may fail active nodes. - cfg.setExecutorService(new GridThreadPoolExecutor()); + cfg.setExecutorService(new IgniteThreadPoolExecutor()); ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java index 2b99542..bea8f4c 100644 --- a/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java +++ b/modules/core/src/test/java/org/gridgain/testframework/junits/GridTestResources.java @@ -134,7 +134,7 @@ public class GridTestResources { * @param prestart Prestart flag. */ public void startThreads(boolean prestart) { - execSvc = new GridThreadPoolExecutor(nodeId.toString(), 40, 40, Long.MAX_VALUE, + execSvc = new IgniteThreadPoolExecutor(nodeId.toString(), 40, 40, Long.MAX_VALUE, new LinkedBlockingQueue<Runnable>()); // Improve concurrency for testing. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java ---------------------------------------------------------------------- diff --git a/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java b/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java index 4d214f4..c5403d4 100644 --- a/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java +++ b/modules/email/src/main/java/org/gridgain/grid/kernal/processors/email/GridEmailProcessor.java @@ -34,7 +34,7 @@ public class GridEmailProcessor extends GridEmailProcessorAdapter { private Deque<GridEmailHolder> q; /** */ - private GridThread snd; + private IgniteThread snd; /** */ private GridWorker worker; @@ -87,7 +87,7 @@ public class GridEmailProcessor extends GridEmailProcessorAdapter { q = new LinkedList<>(); - snd = new GridThread(ctx.config().getGridName(), "email-sender-thread", worker); + snd = new IgniteThread(ctx.config().getGridName(), "email-sender-thread", worker); snd.start(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java index 38e23e1..533f939 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/shuffle/GridHadoopShuffleJob.java @@ -159,7 +159,7 @@ public class GridHadoopShuffleJob<T> implements AutoCloseable { } }; - new GridThread(snd).start(); + new IgniteThread(snd).start(); } ioInitLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java index 9510c8d..bd4fb1b 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/GridHadoopExecutorService.java @@ -186,7 +186,7 @@ public class GridHadoopExecutorService { if (shutdown) w.cancel(); - new GridThread(w).start(); + new IgniteThread(w).start(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java index a9fa657..b9fc2ca 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/taskexecutor/external/communication/GridHadoopExternalCommunication.java @@ -546,7 +546,7 @@ public class GridHadoopExternalCommunication { if (shmemSrv != null) { shmemAcceptWorker = new ShmemAcceptWorker(shmemSrv); - new GridThread(shmemAcceptWorker).start(); + new IgniteThread(shmemAcceptWorker).start(); } nioSrvr.start(); @@ -860,7 +860,7 @@ public class GridHadoopExternalCommunication { client = new GridHadoopTcpNioCommunicationClient(ses); - new GridThread(worker).start(); + new IgniteThread(worker).start(); fin.await(connTimeout0); } @@ -1089,7 +1089,7 @@ public class GridHadoopExternalCommunication { shmemWorkers.add(e); - new GridThread(e).start(); + new IgniteThread(e).start(); } } catch (GridException e) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5068cc6e/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala index 32d25d5..8f67380 100644 --- a/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/gridgain/visor/visor.scala @@ -216,7 +216,7 @@ object visor extends VisorTag { @volatile private var logStarted = false /** Internal thread pool. */ - @volatile var pool: ExecutorService = new GridThreadPoolExecutor() + @volatile var pool: ExecutorService = new IgniteThreadPoolExecutor() /** Configuration file path, if any. */ @volatile var cfgPath: String = null @@ -1514,7 +1514,7 @@ object visor extends VisorTag { cfg.setClientConnectionConfiguration(null) - def createExecutor = new GridThreadPoolExecutor(cpuCnt, cpuCnt, Long.MaxValue, new LinkedBlockingQueue[Runnable]) + def createExecutor = new IgniteThreadPoolExecutor(cpuCnt, cpuCnt, Long.MaxValue, new LinkedBlockingQueue[Runnable]) // All thread pools are overridden to have size equal to number of CPUs. cfg.setExecutorService(createExecutor) @@ -2149,7 +2149,7 @@ object visor extends VisorTag { Thread.currentThread.interrupt() } - pool = new GridThreadPoolExecutor() + pool = new IgniteThreadPoolExecutor() } // Call all close callbacks.
