Repository: incubator-ignite Updated Branches: refs/heads/ignite-sql-tests c89ed06ec -> 571223f6f
IGNITE-160 Renamed methods. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d2f07f56 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d2f07f56 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d2f07f56 Branch: refs/heads/ignite-sql-tests Commit: d2f07f56ef7940894ddbad1d0cf297450517e4e4 Parents: d803519 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Feb 6 16:58:36 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Feb 6 17:35:38 2015 +0300 ---------------------------------------------------------------------- .../singlesplit/SingleSplitsLoadTest.java | 2 - .../ClientAbstractMultiNodeSelfTest.java | 4 +- .../ClientConnectionConfiguration.java | 19 ++-- .../configuration/IgniteConfiguration.java | 92 +++++++------------- .../ignite/internal/GridKernalContextImpl.java | 1 + .../org/apache/ignite/internal/IgnitionEx.java | 16 ++-- .../managers/communication/GridIoManager.java | 2 +- .../node/VisorExecutorServiceConfiguration.java | 8 +- .../internal/ClusterNodeMetricsSelfTest.java | 1 - .../internal/GridCancelUnusedJobSelfTest.java | 2 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +- .../GridCachePreloadLifecycleAbstractTest.java | 8 +- .../cache/GridCacheCommandHandlerSelfTest.java | 5 ++ .../cache/GridCacheSingleNodeLoadTest.java | 5 +- ...ridSingleSplitsNewNodesAbstractLoadTest.java | 4 +- ...SessionCancelSiblingsFromFutureSelfTest.java | 2 +- ...ridSessionCancelSiblingsFromJobSelfTest.java | 2 +- ...idSessionCancelSiblingsFromTaskSelfTest.java | 2 +- ...GridSessionJobWaitTaskAttributeSelfTest.java | 3 +- .../GridSessionSetFutureAttributeSelfTest.java | 2 +- ...nSetFutureAttributeWaitListenerSelfTest.java | 2 +- .../GridSessionSetJobAttributeSelfTest.java | 3 +- ...sionSetJobAttributeWaitListenerSelfTest.java | 2 +- .../GridSessionWaitAttributeSelfTest.java | 3 +- .../junits/GridTestKernalContext.java | 11 ++- .../scala/org/apache/ignite/visor/visor.scala | 6 +- 26 files changed, 90 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java index 30cf64e..6f09188 100644 --- a/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java +++ b/modules/aop/src/test/java/org/apache/loadtests/direct/singlesplit/SingleSplitsLoadTest.java @@ -30,8 +30,6 @@ import org.apache.ignite.testframework.config.*; import org.apache.ignite.testframework.junits.common.*; import org.apache.log4j.*; -import java.util.concurrent.*; - /** * Single split load test. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java index 7fca374..6d5afd5 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/ClientAbstractMultiNodeSelfTest.java @@ -163,9 +163,9 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract c.setCacheConfiguration(cacheConfiguration(null), cacheConfiguration(PARTITIONED_CACHE_NAME), cacheConfiguration(REPLICATED_CACHE_NAME), cacheConfiguration(REPLICATED_ASYNC_CACHE_NAME)); - c.setExecutorService(40); + c.setPublicThreadPoolSize(40); - c.setSystemExecutorService(40); + c.setSystemThreadPoolSize(40); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java index 833bf10..46a417c 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConnectionConfiguration.java @@ -21,7 +21,6 @@ import org.apache.ignite.client.ssl.*; import org.jetbrains.annotations.*; import java.net.*; -import java.util.concurrent.*; /** * REST access configuration. @@ -126,7 +125,7 @@ public class ClientConnectionConfiguration { clientMsgInterceptor = cfg.getClientMessageInterceptor(); restAccessibleFolders = cfg.getRestAccessibleFolders(); - restSvcPoolSz = cfg.getRestExecutorService(); + restSvcPoolSz = cfg.getRestThreadPoolSize(); restIdleTimeout = cfg.getRestIdleTimeout(); jettyPath = cfg.getRestJettyPath(); restPortRange = cfg.getRestPortRange(); @@ -488,24 +487,24 @@ public class ClientConnectionConfiguration { } /** - * Should return an thread pool size to be used for + * Should return a thread pool size to be used for * processing of client messages (REST requests). * - * @return Thread pool implementation to be used for processing of client + * @return Thread pool size to be used for processing of client * messages. */ - public int getRestExecutorService() { + public int getRestThreadPoolSize() { return restSvcPoolSz; } /** - * Sets thread pool to use for processing of client messages (REST requests). + * Sets thread pool size to use for processing of client messages (REST requests). * - * @param restExecSvc Thread pool to use for processing of client messages. - * @see #getRestExecutorService() + * @param restSvcPoolSz Thread pool size to use for processing of client messages. + * @see #getRestThreadPoolSize() */ - public void setRestExecutorService(int restExecSvc) { - this.restSvcPoolSz = restExecSvc; + public void setRestThreadPoolSize(int restSvcPoolSz) { + this.restSvcPoolSz = restSvcPoolSz; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index b6dd8c7..a664c28 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -51,7 +51,6 @@ import javax.management.*; import java.lang.management.*; import java.net.*; import java.util.*; -import java.util.concurrent.*; import static org.apache.ignite.plugin.segmentation.GridSegmentationPolicy.*; @@ -575,13 +574,13 @@ public class IgniteConfiguration { metricsExpTime = cfg.getMetricsExpireTime(); metricsLogFreq = cfg.getMetricsLogFrequency(); metricsUpdateFreq = cfg.getMetricsUpdateFrequency(); - mgmtPoolSz = cfg.getManagementExecutorService(); + mgmtPoolSz = cfg.getManagementThreadPoolSize(); netTimeout = cfg.getNetworkTimeout(); nodeId = cfg.getNodeId(); p2pEnabled = cfg.isPeerClassLoadingEnabled(); p2pLocClsPathExcl = cfg.getPeerClassLoadingLocalClassPathExclude(); p2pMissedCacheSize = cfg.getPeerClassLoadingMissedResourcesCacheSize(); - p2pPoolSz = cfg.getPeerClassLoadingExecutorService(); + p2pPoolSz = cfg.getPeerClassLoadingThreadPoolSize(); pluginCfgs = cfg.getPluginConfigurations(); portableCfg = cfg.getPortableConfiguration(); qryCfg = cfg.getQueryConfiguration(); @@ -615,7 +614,7 @@ public class IgniteConfiguration { smtpSsl = cfg.isSmtpSsl(); smtpStartTls = cfg.isSmtpStartTls(); streamerCfg = cfg.getStreamerConfiguration(); - sysPoolSz = cfg.getSystemExecutorService(); + sysPoolSz = cfg.getSystemThreadPoolSize(); timeSrvPortBase = cfg.getTimeServerPortBase(); timeSrvPortRange = cfg.getTimeServerPortRange(); txCfg = cfg.getTransactionsConfiguration(); @@ -1062,18 +1061,13 @@ public class IgniteConfiguration { } /** - * Should return an instance of fully configured thread pool to be used in grid. + * Should return a thread pool size to be used in grid. * This executor service will be in charge of processing {@link org.apache.ignite.compute.ComputeJob GridJobs} * and user messages sent to node. * <p> - * If not provided, new executor service will be created using the following configuration: - * <ul> - * <li>Core pool size - {@link #DFLT_PUBLIC_CORE_THREAD_CNT}</li> - * <li>Max pool size - {@link #DFLT_PUBLIC_MAX_THREAD_CNT}</li> - * <li>Queue capacity - {@link #DFLT_PUBLIC_THREADPOOL_QUEUE_CAP}</li> - * </ul> + * If not provided, executor service will have size {@link #DFLT_PUBLIC_CORE_THREAD_CNT}. * - * @return Thread pool implementation to be used in grid to process job execution + * @return Thread pool size to be used in grid to process job execution * requests and user messages sent to the node. */ public int getExecutorService() { @@ -1081,71 +1075,49 @@ public class IgniteConfiguration { } /** - * Executor service that is in charge of processing internal system messages. + * Size of thread pool that is in charge of processing internal system messages. * <p> - * If not provided, new executor service will be created using the following configuration: - * <ul> - * <li>Core pool size - {@link #DFLT_SYSTEM_CORE_THREAD_CNT}</li> - * <li>Max pool size - {@link #DFLT_SYSTEM_MAX_THREAD_CNT}</li> - * <li>Queue capacity - {@link #DFLT_SYSTEM_THREADPOOL_QUEUE_CAP}</li> - * </ul> + * If not provided, executor service will have size {@link #DFLT_SYSTEM_CORE_THREAD_CNT}. * - * @return Thread pool implementation to be used in grid for internal system messages. + * @return Thread pool size to be used in grid for internal system messages. */ - public int getSystemExecutorService() { + public int getSystemThreadPoolSize() { return sysPoolSz; } /** - * Executor service that is in charge of processing internal and Visor + * Size of thread pool that is in charge of processing internal and Visor * {@link org.apache.ignite.compute.ComputeJob GridJobs}. * <p> - * If not provided, new executor service will be created using the following configuration: - * <ul> - * <li>Core pool size - {@link #DFLT_MGMT_THREAD_CNT}</li> - * <li>Max pool size - {@link #DFLT_MGMT_THREAD_CNT}</li> - * <li>Queue capacity - unbounded</li> - * </ul> + * If not provided, executor service will have size {@link #DFLT_MGMT_THREAD_CNT} * - * @return Thread pool implementation to be used in grid for internal and Visor + * @return Thread pool size to be used in grid for internal and Visor * jobs processing. */ - public int getManagementExecutorService() { + public int getManagementThreadPoolSize() { return mgmtPoolSz; } /** - * Should return an instance of fully configured executor service which - * is in charge of peer class loading requests/responses. If you don't use + * Size of thread pool which is in charge of peer class loading requests/responses. If you don't use * peer class loading and use GAR deployment only we would recommend to decrease * the value of total threads to {@code 1}. * <p> - * If not provided, new executor service will be created using the following configuration: - * <ul> - * <li>Core pool size - {@link #DFLT_P2P_THREAD_CNT}</li> - * <li>Max pool size - {@link #DFLT_P2P_THREAD_CNT}</li> - * <li>Queue capacity - unbounded</li> - * </ul> + * If not provided, executor service will have size {@link #DFLT_P2P_THREAD_CNT}. * - * @return Thread pool implementation to be used for peer class loading + * @return Thread pool size to be used for peer class loading * requests handling. */ - public int getPeerClassLoadingExecutorService() { + public int getPeerClassLoadingThreadPoolSize() { return p2pPoolSz; } /** - * Executor service that is in charge of processing outgoing GGFS messages. Note that this - * executor must have limited task queue to avoid OutOfMemory errors when incoming data stream - * is faster than network bandwidth. + * Size of thread pool that is in charge of processing outgoing GGFS messages. * <p> - * If not provided, new executor service will be created using the following configuration: - * <ul> - * <li>Core pool size - number of processors available in system</li> - * <li>Max pool size - number of processors available in system</li> - * </ul> + * If not provided, executor service will have size equals number of processors available in system. * - * @return Thread pool implementation to be used for GGFS outgoing message sending. + * @return Thread pool size to be used for GGFS outgoing message sending. */ public int getGgfsExecutorService() { return ggfsPoolSz; @@ -1157,7 +1129,7 @@ public class IgniteConfiguration { * @param poolSz Thread pool size to use within grid. * @see IgniteConfiguration#getExecutorService() */ - public void setExecutorService(int poolSz) { + public void setPublicThreadPoolSize(int poolSz) { this.pubPoolSz = poolSz; } @@ -1165,9 +1137,9 @@ public class IgniteConfiguration { * Sets system thread pool size to use within grid. * * @param poolSz Thread pool size to use within grid. - * @see IgniteConfiguration#getSystemExecutorService() + * @see IgniteConfiguration#getSystemThreadPoolSize() */ - public void setSystemExecutorService(int poolSz) { + public void setSystemThreadPoolSize(int poolSz) { this.sysPoolSz = poolSz; } @@ -1175,9 +1147,9 @@ public class IgniteConfiguration { * Sets management thread pool size to use within grid. * * @param poolSz Thread pool size to use within grid. - * @see IgniteConfiguration#getManagementExecutorService() + * @see IgniteConfiguration#getManagementThreadPoolSize() */ - public void setManagementExecutorService(int poolSz) { + public void setManagementThreadPoolSize(int poolSz) { this.mgmtPoolSz = poolSz; } @@ -1185,9 +1157,9 @@ public class IgniteConfiguration { * Sets thread pool size to use for peer class loading. * * @param poolSz Thread pool size to use within grid. - * @see IgniteConfiguration#getPeerClassLoadingExecutorService() + * @see IgniteConfiguration#getPeerClassLoadingThreadPoolSize() */ - public void setPeerClassLoadingExecutorService(int poolSz) { + public void setPeerClassLoadingThreadPoolSize(int poolSz) { this.p2pPoolSz = poolSz; } @@ -1202,7 +1174,7 @@ public class IgniteConfiguration { } /** - * Should return GridGain installation home folder. If not provided, the system will check + * Should return Ignite installation home folder. If not provided, the system will check * {@code IGNITE_HOME} system property and environment variable in that order. If * {@code IGNITE_HOME} still could not be obtained, then grid will not start and exception * will be thrown. @@ -1218,7 +1190,7 @@ public class IgniteConfiguration { /** * Sets Ignite installation folder. * - * @param ggHome {@code GridGain} installation folder. + * @param ggHome {@code Ignition} installation folder. * @see IgniteConfiguration#getIgniteHome() * @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME */ @@ -1227,13 +1199,13 @@ public class IgniteConfiguration { } /** - * Gets GridGain work folder. If not provided, the method will use work folder under + * Gets Ignite work folder. If not provided, the method will use work folder under * {@code IGNITE_HOME} specified by {@link IgniteConfiguration#setIgniteHome(String)} or * {@code IGNITE_HOME} environment variable or system property. * <p> * If {@code IGNITE_HOME} is not provided, then system temp folder is used. * - * @return GridGain work folder or {@code null} to make the system attempt to infer it automatically. + * @return Ignite work folder or {@code null} to make the system attempt to infer it automatically. * @see IgniteConfiguration#getIgniteHome() * @see org.apache.ignite.IgniteSystemProperties#IGNITE_HOME */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index e4ffb35..c9604de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -377,6 +377,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable this.p2pExecSvc = p2pExecSvc; this.mgmtExecSvc = mgmtExecSvc; this.ggfsExecSvc = ggfsExecSvc; + this.restExecSvc = restExecSvc; try { spring = SPRING.create(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index cdaf7c4..0508bb7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1469,8 +1469,8 @@ public class IgnitionEx { // maximum threads has no effect. sysExecSvc = new IgniteThreadPoolExecutor( "sys-" + cfg.getGridName(), - cfg.getSystemExecutorService(), - cfg.getSystemExecutorService(), + cfg.getSystemThreadPoolSize(), + cfg.getSystemThreadPoolSize(), DFLT_SYSTEM_KEEP_ALIVE_TIME, new LinkedBlockingQueue<Runnable>(DFLT_SYSTEM_THREADPOOL_QUEUE_CAP)); @@ -1483,8 +1483,8 @@ public class IgnitionEx { // not be needed. mgmtExecSvc = new IgniteThreadPoolExecutor( "mgmt-" + cfg.getGridName(), - cfg.getManagementExecutorService(), - cfg.getManagementExecutorService(), + cfg.getManagementThreadPoolSize(), + cfg.getManagementThreadPoolSize(), 0, new LinkedBlockingQueue<Runnable>()); @@ -1494,8 +1494,8 @@ public class IgnitionEx { // not be needed. p2pExecSvc = new IgniteThreadPoolExecutor( "p2p-" + cfg.getGridName(), - cfg.getPeerClassLoadingExecutorService(), - cfg.getPeerClassLoadingExecutorService(), + cfg.getPeerClassLoadingThreadPoolSize(), + cfg.getPeerClassLoadingThreadPoolSize(), 0, new LinkedBlockingQueue<Runnable>()); @@ -1513,8 +1513,8 @@ public class IgnitionEx { if (clientCfg != null) { restExecSvc = new IgniteThreadPoolExecutor( "rest-" + cfg.getGridName(), - clientCfg.getRestExecutorService(), - clientCfg.getRestExecutorService(), + clientCfg.getRestThreadPoolSize(), + clientCfg.getRestThreadPoolSize(), DFLT_REST_KEEP_ALIVE_TIME, new LinkedBlockingQueue<Runnable>(DFLT_REST_THREADPOOL_QUEUE_CAP) ); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java index 00d53e9..b00a3f4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java @@ -543,7 +543,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } catch (RejectedExecutionException e) { U.error(log, "Failed to process P2P message due to execution rejection. Increase the upper bound " + - "on 'ExecutorService' provided by 'GridConfiguration.getPeerClassLoadingExecutorService()'. " + + "on 'ExecutorService' provided by 'GridConfiguration.getPeerClassLoadingThreadPoolSize()'. " + "Will attempt to process message in the listener thread instead.", e); c.run(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java index ac32610..b9b5728 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java @@ -22,8 +22,6 @@ import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; -import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*; - /** * Data transfer object for node executors configuration properties. */ @@ -52,14 +50,14 @@ public class VisorExecutorServiceConfiguration implements Serializable { cfg.executeService(c.getExecutorService()); - cfg.systemExecutorService(c.getSystemExecutorService()); + cfg.systemExecutorService(c.getSystemThreadPoolSize()); - cfg.p2pExecutorService(c.getPeerClassLoadingExecutorService()); + cfg.p2pExecutorService(c.getPeerClassLoadingThreadPoolSize()); ClientConnectionConfiguration cc = c.getClientConnectionConfiguration(); if (cc != null) - cfg.restExecutorService(cc.getRestExecutorService()); + cfg.restExecutorService(cc.getRestThreadPoolSize()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java index fefc2ed..9b3b8ca 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterNodeMetricsSelfTest.java @@ -169,7 +169,6 @@ public class ClusterNodeMetricsSelfTest extends GridCommonAbstractTest { assert metrics.getTotalRejectedJobs() == 0; assert metrics.getTotalExecutedTasks() == 0; - assertTrue("MaximumJobExecuteTime=" + metrics.getMaximumJobExecuteTime() + " is less than AverageJobExecuteTime=" + metrics.getAverageJobExecuteTime(), metrics.getMaximumJobExecuteTime() >= metrics.getAverageJobExecuteTime()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java index 598fa2d..5649212 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCancelUnusedJobSelfTest.java @@ -69,7 +69,7 @@ public class GridCancelUnusedJobSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 00cd95a..d22b73b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.resources.*; import org.apache.ignite.testframework.*; -import java.io.*; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.*; @@ -92,9 +91,9 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setExecutorService(RETRIES * 2); + cfg.setPublicThreadPoolSize(RETRIES * 2); - cfg.setSystemExecutorService(RETRIES * 2); + cfg.setSystemThreadPoolSize(RETRIES * 2); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java index 394e8f8..a90add8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadLifecycleAbstractTest.java @@ -26,10 +26,8 @@ import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; -import org.apache.ignite.thread.*; import java.io.*; -import java.util.concurrent.*; import static org.apache.ignite.cache.CachePreloadMode.*; import static org.apache.ignite.events.IgniteEventType.*; @@ -86,9 +84,9 @@ public abstract class GridCachePreloadLifecycleAbstractTest extends GridCommonAb // c.setPeerClassLoadingLocalClassPathExclude(GridCachePreloadLifecycleAbstractTest.class.getName(), // MyValue.class.getName()); - c.setExecutorService(10); - c.setSystemExecutorService(10); - c.setPeerClassLoadingExecutorService(3); + c.setPublicThreadPoolSize(10); + c.setSystemThreadPoolSize(10); + c.setPeerClassLoadingThreadPoolSize(3); c.setLifecycleBeans(lifecycleBean); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java index b5099ce..a200b5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java @@ -62,6 +62,11 @@ public class GridCacheCommandHandlerSelfTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(); cfg.setLocalHost("localhost"); + + ClientConnectionConfiguration clnCfg = new ClientConnectionConfiguration(); + clnCfg.setRestTcpHost("localhost"); + + cfg.setClientConnectionConfiguration(clnCfg); cfg.setDiscoverySpi(disco); cfg.setCacheConfiguration(cacheCfg); // Add 'null' cache configuration. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java index e380d05..2085f94 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/cache/GridCacheSingleNodeLoadTest.java @@ -26,7 +26,6 @@ import org.apache.ignite.spi.collision.fifoqueue.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.*; -import org.apache.ignite.thread.*; import org.jetbrains.annotations.*; import java.util.*; @@ -122,8 +121,8 @@ public class GridCacheSingleNodeLoadTest { c.setCollisionSpi(cols); - c.setExecutorService(THREADS / 2); - c.setSystemExecutorService(THREADS * 2); + c.setPublicThreadPoolSize(THREADS / 2); + c.setSystemThreadPoolSize(THREADS * 2); CacheConfiguration cc = new CacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java index c7f4b95..ba65772 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/newnodes/GridSingleSplitsNewNodesAbstractLoadTest.java @@ -27,9 +27,7 @@ import org.apache.ignite.spi.discovery.*; import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.config.*; import org.apache.ignite.testframework.junits.common.*; -import org.apache.ignite.thread.*; -import java.util.concurrent.*; import java.util.concurrent.atomic.*; /** @@ -59,7 +57,7 @@ public abstract class GridSingleSplitsNewNodesAbstractLoadTest extends GridCommo cfg.setMetricsHistorySize(1000); - cfg.setExecutorService(100); + cfg.setPublicThreadPoolSize(100); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java index 4b05a1d..4dc4b6d 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java @@ -73,7 +73,7 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr c.setDiscoverySpi(discoSpi); - c.setExecutorService( SPLIT_COUNT * EXEC_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT * EXEC_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java index 7ef388b..fdc6f5a 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -72,7 +72,7 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * EXEC_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT * EXEC_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java index 1dfecba..752e330 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -72,7 +72,7 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * EXEC_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT * EXEC_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java index 713ce4e..1ab3b8d 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobWaitTaskAttributeSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; -import java.util.concurrent.*; import java.util.concurrent.atomic.*; /** @@ -59,7 +58,7 @@ public class GridSessionJobWaitTaskAttributeSelfTest extends GridCommonAbstractT c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * EXEC_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT * EXEC_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java index 767d531..854d29e 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java @@ -65,7 +65,7 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * EXEC_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT * EXEC_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index 7b926b0..6afccb1 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -65,7 +65,7 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * 2); + c.setPublicThreadPoolSize(SPLIT_COUNT * 2); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java index 818c2e7..2489f31 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; -import java.util.concurrent.*; import java.util.concurrent.atomic.*; /** @@ -59,7 +58,7 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * EXEC_COUNT); + c.setPublicThreadPoolSize(SPLIT_COUNT * EXEC_COUNT); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index bd1f5ee..7105ea1 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -59,7 +59,7 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb c.setDiscoverySpi(discoSpi); - c.setExecutorService(SPLIT_COUNT * 2); + c.setPublicThreadPoolSize(SPLIT_COUNT * 2); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java index 61595af..496f086 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java @@ -29,7 +29,6 @@ import org.apache.ignite.testframework.junits.common.*; import java.io.*; import java.util.*; -import java.util.concurrent.*; /** * Tests waiting for session attributes. @@ -83,7 +82,7 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(discoSpi); - c.setExecutorService(JOB_NUM * 2); + c.setPublicThreadPoolSize(JOB_NUM * 2); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java index f4901b6..00f6fef 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestKernalContext.java @@ -24,7 +24,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; import java.util.*; -import java.util.concurrent.ExecutorService; +import java.util.concurrent.*; /** * Test context. @@ -90,8 +90,13 @@ public class GridTestKernalContext extends GridKernalContextImpl { return S.toString(GridTestKernalContext.class, this, super.toString()); } - public void setSystemExecutorService(ExecutorService systemExecutorService) { - this.sysExecSvc = systemExecutorService; + /** + * Sets system executor service. + * + * @param sysExecSvc Executor service + */ + public void setSystemExecutorService(ExecutorService sysExecSvc) { + this.sysExecSvc = sysExecSvc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2f07f56/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ---------------------------------------------------------------------- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala index 80b261f..67b0a81 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala @@ -1521,9 +1521,9 @@ object visor extends VisorTag { cfg.setClientConnectionConfiguration(null) // All thread pools are overridden to have size equal to number of CPUs. - cfg.setExecutorService(cpuCnt) - cfg.setSystemExecutorService(cpuCnt) - cfg.setPeerClassLoadingExecutorService(cpuCnt) + cfg.setPublicThreadPoolSize(cpuCnt) + cfg.setSystemThreadPoolSize(cpuCnt) + cfg.setPeerClassLoadingThreadPoolSize(cpuCnt) var ioSpi = cfg.getCommunicationSpi
