# [GG-1058]: DR moved from Ignite to GG.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/29fe50c7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29fe50c7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29fe50c7 Branch: refs/heads/ignite-1058 Commit: 29fe50c786091369cb00713ebadaa297dc23e09d Parents: 23a3f10 Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Mon Jun 29 20:44:06 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Mon Jun 29 20:44:06 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 29 --------------- .../ignite/internal/GridKernalContext.java | 5 --- .../ignite/internal/GridKernalContextImpl.java | 11 ------ .../apache/ignite/internal/IgniteKernal.java | 3 -- .../org/apache/ignite/internal/IgnitionEx.java | 12 +------ .../managers/communication/GridIoManager.java | 38 +++++--------------- .../junits/GridTestKernalContext.java | 10 ------ 7 files changed, 10 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/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 6e55a35..2d36c7a 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 @@ -162,9 +162,6 @@ public class IgniteConfiguration { /** Default size of management thread pool. */ public static final int DFLT_MGMT_THREAD_CNT = 4; - /** Default size of DR (Data Replication) thread pool. */ - public static final int DFLT_DR_THREAD_CNT = 4; - /** Default segmentation policy. */ public static final SegmentationPolicy DFLT_SEG_PLC = STOP; @@ -213,9 +210,6 @@ public class IgniteConfiguration { /** IGFS pool size. */ private int igfsPoolSize = AVAILABLE_PROC_CNT; - /** DR pool size. */ - private int drPoolSize = DFLT_DR_THREAD_CNT; - /** Utility cache pool size. */ private int utilityCachePoolSize = DFLT_SYSTEM_CORE_THREAD_CNT; @@ -688,17 +682,6 @@ public class IgniteConfiguration { } /** - * Size of thread pool that is in charge of processing DR (Data Replication) messages. - * <p> - * If not provided, executor service will have size {@link #DFLT_DR_THREAD_CNT}. - * - * @return Thread pool size to be used for DR message processing. - */ - public int getDrThreadPoolSize() { - return drPoolSize; - } - - /** * Default size of thread pool that is in charge of processing utility cache messages. * <p> * If not provided, executor service will have size {@link #DFLT_SYSTEM_CORE_THREAD_CNT}. @@ -808,18 +791,6 @@ public class IgniteConfiguration { } /** - * Set thread pool size that will be used to send and receive DR (Data Replication) messages. - * - * @param poolSize Set thread pool size. - * @return {@code this} for chaining. - */ - public IgniteConfiguration setDrThreadPoolSize(int poolSize) { - drPoolSize = poolSize; - - return this; - } - - /** * Sets default thread pool size that will be used to process utility cache messages. * * @param poolSize Default executor service size to use for utility cache messages. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java index c354609..d6542f3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java @@ -465,11 +465,6 @@ public interface GridKernalContext extends Iterable<GridComponent> { public ExecutorService getExecutorService(); /** - * @return Thread pool implementation to be used in grid data replication. - */ - public ExecutorService getDrExecutorService(); - - /** * Executor service that is in charge of processing internal system messages. * * @return Thread pool implementation to be used in grid for internal system messages. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/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 c759191..8abb135 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 @@ -254,10 +254,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** */ @GridToStringExclude - protected ExecutorService drExecSvc; - - /** */ - @GridToStringExclude protected ExecutorService sysExecSvc; /** */ @@ -345,7 +341,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable ExecutorService mgmtExecSvc, ExecutorService igfsExecSvc, ExecutorService restExecSvc, - ExecutorService drExecSvc, List<PluginProvider> plugins) throws IgniteCheckedException { assert grid != null; assert cfg != null; @@ -362,7 +357,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable this.mgmtExecSvc = mgmtExecSvc; this.igfsExecSvc = igfsExecSvc; this.restExecSvc = restExecSvc; - this.drExecSvc = drExecSvc; marshCtx = new MarshallerContextImpl(plugins); @@ -844,11 +838,6 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable } /** {@inheritDoc} */ - @Override public ExecutorService getDrExecutorService() { - return drExecSvc; - } - - /** {@inheritDoc} */ @Override public ExecutorService getSystemExecutorService() { return sysExecSvc; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 2c6596b..30931fa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -527,7 +527,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { * @param mgmtExecSvc Management executor service. * @param igfsExecSvc IGFS executor service. * @param restExecSvc Reset executor service. - * @param drExecSvc DR (Data Replication) executor service. * @param errHnd Error handler to use for notification about startup problems. * @throws IgniteCheckedException Thrown in case of any errors. */ @@ -541,7 +540,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ExecutorService mgmtExecSvc, ExecutorService igfsExecSvc, ExecutorService restExecSvc, - ExecutorService drExecSvc, GridAbsClosure errHnd) throws IgniteCheckedException { @@ -647,7 +645,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { mgmtExecSvc, igfsExecSvc, restExecSvc, - drExecSvc, plugins); cfg.getMarshaller().setContext(ctx.marshallerContext()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/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 590a6df..5cbe377 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 @@ -1296,9 +1296,6 @@ public class IgnitionEx { /** Marshaller cache executor service. */ private ExecutorService marshCacheExecSvc; - /** DR cache executor service. */ - private ExecutorService drExecSvc; - /** Grid state. */ private volatile IgniteState state = STOPPED; @@ -1527,13 +1524,6 @@ public class IgnitionEx { myCfg.getMarshallerCacheKeepAliveTime(), new LinkedBlockingQueue<Runnable>(DFLT_SYSTEM_THREADPOOL_QUEUE_CAP)); - drExecSvc = new IgniteThreadPoolExecutor( - "data-replication-" + cfg.getGridName(), - cfg.getDrThreadPoolSize(), - cfg.getDrThreadPoolSize(), - DFLT_PUBLIC_KEEP_ALIVE_TIME, - new LinkedBlockingQueue<Runnable>(DFLT_SYSTEM_THREADPOOL_QUEUE_CAP)); - // Register Ignite MBean for current grid instance. registerFactoryMbean(myCfg.getMBeanServer()); @@ -1546,7 +1536,7 @@ public class IgnitionEx { grid = grid0; grid0.start(myCfg, utilityCacheExecSvc, marshCacheExecSvc, execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc, - igfsExecSvc, restExecSvc, drExecSvc, + igfsExecSvc, restExecSvc, new CA() { @Override public void apply() { startLatch.countDown(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/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 fd4841b..4d422c6 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 @@ -86,9 +86,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa /** Affinity assignment executor service. */ private ExecutorService affPool; - /** DR (Data Replication) executor service. */ - private ExecutorService drPool; - /** Utility cache pool. */ private ExecutorService utilityCachePool; @@ -191,7 +188,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa p2pPool = ctx.getPeerClassLoadingExecutorService(); sysPool = ctx.getSystemExecutorService(); mgmtPool = ctx.getManagementExecutorService(); - drPool = ctx.getDrExecutorService(); utilityCachePool = ctx.utilityCachePool(); marshCachePool = ctx.marshallerCachePool(); affPool = new IgniteThreadPoolExecutor( @@ -589,7 +585,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa case AFFINITY_POOL: case UTILITY_CACHE_POOL: case MARSH_CACHE_POOL: - case DR_POOL: { if (msg.isOrdered()) processOrderedMessage(nodeId, msg, plc, msgC); @@ -600,14 +595,18 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } default: + if (plc < 0) + throw new IgniteException("Failed to process message with negative policy. [policy=" + + plc + ']'); + if (isReservedGridIoPolicy(plc)) - throw new IgniteException("Failed to process message with policy of reserved range, [policy=" + throw new IgniteException("Failed to process message with policy of reserved range. [policy=" + plc + ']'); + + if (msg.isOrdered()) + processOrderedMessage(nodeId, msg, plc, msgC); else - if (msg.isOrdered()) - processOrderedMessage(nodeId, msg, plc, msgC); - else - processRegularMessage(nodeId, msg, plc, msgC); + processRegularMessage(nodeId, msg, plc, msgC); } } catch (IgniteCheckedException e) { @@ -636,8 +635,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa return mgmtPool; case AFFINITY_POOL: return affPool; - case DR_POOL: - return drPool; case UTILITY_CACHE_POOL: assert utilityCachePool != null : "Utility cache pool is not configured."; @@ -667,23 +664,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa } } -// /** -// * The kind of the Pool. -// */ -// public static interface CustomPool { -// /** -// * Gets the Id (kind) of this Pool. -// * @return The id. -// */ -// public byte kind(); -// -// /** -// * Gets the Executor for this Pool. -// * @return The executor. -// */ -// public Executor executor(); -// } - /** * @param nodeId Node ID. * @param msg Message. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29fe50c7/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 4485d5e..24502da 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 @@ -46,7 +46,6 @@ public class GridTestKernalContext extends GridKernalContextImpl { null, null, null, - null, U.allPluginProviders()); GridTestUtils.setFieldValue(grid(), "cfg", config()); @@ -103,13 +102,4 @@ public class GridTestKernalContext extends GridKernalContextImpl { public void setExecutorService(ExecutorService execSvc){ this.execSvc = execSvc; } - - /** - * Sets executor service. - * - * @param execSvc Executor service - */ - public void setDrExecutorService(ExecutorService execSvc){ - this.drExecSvc = execSvc; - } }
