You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/29 19:49:32 UTC
[01/12] incubator-ignite git commit: #[GG-10298]: workable solution.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1058 6d2651082 -> 29fe50c78
#[GG-10298]: workable solution.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/999b5f03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/999b5f03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/999b5f03
Branch: refs/heads/ignite-1058
Commit: 999b5f03a0fabb959b3600e3554db01f92d4d79e
Parents: e1c49b7
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Jun 25 20:06:06 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Jun 25 20:06:06 2015 +0300
----------------------------------------------------------------------
.../configuration/IgniteConfiguration.java | 32 ++++++++++++++++++++
.../ignite/internal/GridKernalContext.java | 5 +++
.../ignite/internal/GridKernalContextImpl.java | 11 +++++++
.../apache/ignite/internal/IgniteKernal.java | 4 ++-
.../org/apache/ignite/internal/IgnitionEx.java | 12 +++++++-
.../managers/communication/GridIoManager.java | 15 ++++++++-
.../managers/communication/GridIoPolicy.java | 5 ++-
.../junits/GridTestKernalContext.java | 10 ++++++
8 files changed, 90 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/999b5f03/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 2d36c7a..73d0c80 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
@@ -156,12 +156,18 @@ public class IgniteConfiguration {
/** Default max queue capacity of system thread pool. */
public static final int DFLT_SYSTEM_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
+ /** Default max queue capacity of DR (Data Replication) thread pool. */
+ public static final int DFLT_DR_THREADPOOL_QUEUE_CAP = 40;
+
/** Default size of peer class loading thread pool. */
public static final int DFLT_P2P_THREAD_CNT = 2;
/** 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;
@@ -210,6 +216,9 @@ 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;
@@ -682,6 +691,17 @@ 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}.
@@ -791,6 +811,18 @@ 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/999b5f03/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 d6542f3..c354609 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,6 +465,11 @@ 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/999b5f03/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 65107a7..ecc02a7 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,6 +254,10 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
/** */
@GridToStringExclude
+ protected ExecutorService drExecSvc;
+
+ /** */
+ @GridToStringExclude
protected ExecutorService sysExecSvc;
/** */
@@ -341,6 +345,7 @@ 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;
@@ -357,6 +362,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable
this.mgmtExecSvc = mgmtExecSvc;
this.igfsExecSvc = igfsExecSvc;
this.restExecSvc = restExecSvc;
+ this.drExecSvc = drExecSvc;
marshCtx = new MarshallerContextImpl(plugins);
@@ -838,6 +844,11 @@ 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/999b5f03/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 e19d3d3..2c6596b 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
@@ -77,7 +77,6 @@ import javax.management.*;
import java.io.*;
import java.lang.management.*;
import java.lang.reflect.*;
-import java.security.*;
import java.text.*;
import java.util.*;
import java.util.concurrent.*;
@@ -528,6 +527,7 @@ 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,6 +541,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
ExecutorService mgmtExecSvc,
ExecutorService igfsExecSvc,
ExecutorService restExecSvc,
+ ExecutorService drExecSvc,
GridAbsClosure errHnd)
throws IgniteCheckedException
{
@@ -646,6 +647,7 @@ 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/999b5f03/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 5cbe377..b502f14 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,6 +1296,9 @@ public class IgnitionEx {
/** Marshaller cache executor service. */
private ExecutorService marshCacheExecSvc;
+ /** DR cache executor service. */
+ private ExecutorService drExecSvc;
+
/** Grid state. */
private volatile IgniteState state = STOPPED;
@@ -1524,6 +1527,13 @@ 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_DR_THREADPOOL_QUEUE_CAP));
+
// Register Ignite MBean for current grid instance.
registerFactoryMbean(myCfg.getMBeanServer());
@@ -1536,7 +1546,7 @@ public class IgnitionEx {
grid = grid0;
grid0.start(myCfg, utilityCacheExecSvc, marshCacheExecSvc, execSvc, sysExecSvc, p2pExecSvc, mgmtExecSvc,
- igfsExecSvc, restExecSvc,
+ igfsExecSvc, restExecSvc, drExecSvc,
new CA() {
@Override public void apply() {
startLatch.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/999b5f03/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 4382731..b522a1d 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
@@ -83,6 +83,9 @@ 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;
@@ -185,6 +188,7 @@ 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(
@@ -531,7 +535,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
case MANAGEMENT_POOL:
case AFFINITY_POOL:
case UTILITY_CACHE_POOL:
- case MARSH_CACHE_POOL: {
+ case MARSH_CACHE_POOL:
+ case DR_POOL:
+ {
if (msg.isOrdered())
processOrderedMessage(nodeId, msg, plc, msgC);
else
@@ -539,6 +545,10 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
break;
}
+
+ default:
+ throw new IllegalStateException("Failed to process message dues to " +
+ "unknown policy, [policy=" + msg.policy() + ']');
}
}
catch (IgniteCheckedException e) {
@@ -568,6 +578,9 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
case AFFINITY_POOL:
return affPool;
+ case DR_POOL:
+ return drPool;
+
case UTILITY_CACHE_POOL:
assert utilityCachePool != null : "Utility cache pool is not configured.";
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/999b5f03/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
index 6e45043..ad74baa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
@@ -43,7 +43,10 @@ public enum GridIoPolicy {
UTILITY_CACHE_POOL,
/** Marshaller cache execution pool. */
- MARSH_CACHE_POOL;
+ MARSH_CACHE_POOL,
+
+ /** DR internal messaging pool. */
+ DR_POOL;
/** Enum values. */
private static final GridIoPolicy[] VALS = values();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/999b5f03/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 24502da..4485d5e 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,6 +46,7 @@ public class GridTestKernalContext extends GridKernalContextImpl {
null,
null,
null,
+ null,
U.allPluginProviders());
GridTestUtils.setFieldValue(grid(), "cfg", config());
@@ -102,4 +103,13 @@ 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;
+ }
}
[05/12] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b40d8a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b40d8a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b40d8a5e
Branch: refs/heads/ignite-1058
Commit: b40d8a5e7d22142ee2e0b1b12507fba7f5607e02
Parents: c86f8f9 01d842a
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 26 13:19:56 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 26 13:19:56 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/GridDiscoveryEventSelfTest.java | 12 +++++-------
scripts/git-patch-prop.sh | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[07/12] incubator-ignite git commit: # GG-10298: corrections by
review results.
Posted by sb...@apache.org.
# GG-10298: corrections by review results.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/64fb6e7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/64fb6e7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/64fb6e7c
Branch: refs/heads/ignite-1058
Commit: 64fb6e7c8b95f7d3fdfaf3949c9c9d86fc0ae7ad
Parents: b8604cb
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 26 13:32:42 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 26 13:32:42 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/configuration/IgniteConfiguration.java | 4 ----
.../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 3 +--
.../ignite/internal/managers/communication/GridIoManager.java | 5 -----
3 files changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64fb6e7c/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 62df015..6e55a35 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
@@ -156,10 +156,6 @@ public class IgniteConfiguration {
/** Default max queue capacity of system thread pool. */
public static final int DFLT_SYSTEM_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
- /** Default max queue capacity of DR (Data Replication) thread pool. */
- // TODO: Remove
- public static final int DFLT_DR_THREADPOOL_QUEUE_CAP = 40;
-
/** Default size of peer class loading thread pool. */
public static final int DFLT_P2P_THREAD_CNT = 2;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64fb6e7c/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 4ed3932..590a6df 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
@@ -1532,8 +1532,7 @@ public class IgnitionEx {
cfg.getDrThreadPoolSize(),
cfg.getDrThreadPoolSize(),
DFLT_PUBLIC_KEEP_ALIVE_TIME,
- // TODO: Use DFLT_SYSTEM_THREADPOOL_QUEUE_CAP instead.
- new LinkedBlockingQueue<Runnable>(DFLT_DR_THREADPOOL_QUEUE_CAP));
+ new LinkedBlockingQueue<Runnable>(DFLT_SYSTEM_THREADPOOL_QUEUE_CAP));
// Register Ignite MBean for current grid instance.
registerFactoryMbean(myCfg.getMBeanServer());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/64fb6e7c/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 5e8da51..2203be8 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
@@ -545,11 +545,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
break;
}
-
- // TODO: Remove.
- default:
- throw new IllegalStateException("Failed to process message due to " +
- "unknown policy, [policy=" + msg.policy() + ']');
}
}
catch (IgniteCheckedException e) {
[12/12] incubator-ignite git commit: # [GG-1058]: DR moved from
Ignite to GG.
Posted by sb...@apache.org.
# [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 <iv...@gridgain.com>
Authored: Mon Jun 29 20:44:06 2015 +0300
Committer: iveselovskiy <iv...@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;
- }
}
[04/12] incubator-ignite git commit: # GG-10298: Review.
Posted by sb...@apache.org.
# GG-10298: Review.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c7e1dc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c7e1dc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c7e1dc1
Branch: refs/heads/ignite-1058
Commit: 9c7e1dc14d9df3236d45515bbcaf984b8a3d6024
Parents: 8f57eca
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 26 10:00:48 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 26 10:00:48 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/configuration/IgniteConfiguration.java | 1 +
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 1 +
.../ignite/internal/managers/communication/GridIoManager.java | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c7e1dc1/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 73d0c80..62df015 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
@@ -157,6 +157,7 @@ public class IgniteConfiguration {
public static final int DFLT_SYSTEM_THREADPOOL_QUEUE_CAP = Integer.MAX_VALUE;
/** Default max queue capacity of DR (Data Replication) thread pool. */
+ // TODO: Remove
public static final int DFLT_DR_THREADPOOL_QUEUE_CAP = 40;
/** Default size of peer class loading thread pool. */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c7e1dc1/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 b502f14..4ed3932 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
@@ -1532,6 +1532,7 @@ public class IgnitionEx {
cfg.getDrThreadPoolSize(),
cfg.getDrThreadPoolSize(),
DFLT_PUBLIC_KEEP_ALIVE_TIME,
+ // TODO: Use DFLT_SYSTEM_THREADPOOL_QUEUE_CAP instead.
new LinkedBlockingQueue<Runnable>(DFLT_DR_THREADPOOL_QUEUE_CAP));
// Register Ignite MBean for current grid instance.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c7e1dc1/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 3d90a51..5e8da51 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
@@ -546,6 +546,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
break;
}
+ // TODO: Remove.
default:
throw new IllegalStateException("Failed to process message due to " +
"unknown policy, [policy=" + msg.policy() + ']');
@@ -577,7 +578,6 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
return mgmtPool;
case AFFINITY_POOL:
return affPool;
-
case DR_POOL:
return drPool;
[08/12] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
into ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-7' into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b843dabd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b843dabd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b843dabd
Branch: refs/heads/ignite-1058
Commit: b843dabd78b52bc8d93b302db1221121054bae25
Parents: 64fb6e7 6e23608
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 26 17:02:23 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 26 17:02:23 2015 +0300
----------------------------------------------------------------------
.../GridCachePartitionExchangeManager.java | 6 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 151 ++++++-----
.../ignite/spi/discovery/tcp/ServerImpl.java | 103 +++++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 4 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++++++++-
6 files changed, 451 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
[10/12] incubator-ignite git commit: Merge branch 'ignite-1058' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-1058' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoPolicy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e428f424
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e428f424
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e428f424
Branch: refs/heads/ignite-1058
Commit: e428f4245fb017808c38f599390cd9fb923cbef0
Parents: be973e2 6d26510
Author: iveselovskiy <iv...@gridgain.com>
Authored: Mon Jun 29 18:45:21 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Mon Jun 29 18:45:21 2015 +0300
----------------------------------------------------------------------
.../managers/communication/GridIoManager.java | 134 +++++++++++++++----
.../managers/communication/GridIoMessage.java | 15 +--
.../managers/communication/GridIoPolicy.java | 35 ++---
.../eventstorage/GridEventStorageManager.java | 2 +-
.../internal/processors/cache/CacheType.java | 8 +-
.../processors/cache/GridCacheContext.java | 4 +-
.../processors/cache/GridCacheIoManager.java | 12 +-
.../GridDistributedTxFinishRequest.java | 11 +-
.../GridDistributedTxPrepareRequest.java | 9 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 4 +-
.../near/GridNearTxFinishRequest.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 2 +-
.../distributed/near/GridNearTxRemote.java | 4 +-
.../cache/transactions/IgniteInternalTx.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 10 +-
.../transactions/IgniteTxLocalAdapter.java | 2 +-
.../internal/processors/igfs/IgfsContext.java | 5 +-
.../plugin/IgnitePluginProcessor.java | 2 +-
.../communication/IoPoolExtension.java | 47 +++++++
.../communication/GridIoManagerSelfTest.java | 2 +-
.../cache/IgniteInternalCacheTypesTest.java | 3 +-
25 files changed, 220 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e428f424/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
[06/12] incubator-ignite git commit: Merge branch 'ignite-gg-10298'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-gg-10298' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b8604cb4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b8604cb4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b8604cb4
Branch: refs/heads/ignite-1058
Commit: b8604cb407deb3bd841f308b4ea35aa9cafc8af0
Parents: b40d8a5 9c7e1dc
Author: iveselovskiy <iv...@gridgain.com>
Authored: Fri Jun 26 13:22:29 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Fri Jun 26 13:22:29 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/configuration/IgniteConfiguration.java | 1 +
.../core/src/main/java/org/apache/ignite/internal/IgnitionEx.java | 1 +
.../ignite/internal/managers/communication/GridIoManager.java | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[02/12] incubator-ignite git commit: # [GG-10298]: corrections.
Posted by sb...@apache.org.
# [GG-10298]: corrections.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c86f8f9c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c86f8f9c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c86f8f9c
Branch: refs/heads/ignite-1058
Commit: c86f8f9cea3204b12c28606702f784b05bfe777f
Parents: 999b5f0
Author: iveselovskiy <iv...@gridgain.com>
Authored: Thu Jun 25 20:39:52 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Thu Jun 25 20:39:52 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/managers/communication/GridIoManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c86f8f9c/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 b522a1d..3d90a51 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
@@ -547,7 +547,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
}
default:
- throw new IllegalStateException("Failed to process message dues to " +
+ throw new IllegalStateException("Failed to process message due to " +
"unknown policy, [policy=" + msg.policy() + ']');
}
}
[09/12] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be973e23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be973e23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be973e23
Branch: refs/heads/ignite-1058
Commit: be973e232559dccd8969baf5ccae9373bd8ad29b
Parents: 64fb6e7 1d5cfbc
Author: iveselovskiy <iv...@gridgain.com>
Authored: Mon Jun 29 18:43:48 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Mon Jun 29 18:43:48 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/cluster/ClusterGroup.java | 9 +-
.../ignite/internal/GridKernalContextImpl.java | 2 +-
.../internal/cluster/ClusterGroupAdapter.java | 12 +-
.../cluster/IgniteClusterAsyncImpl.java | 7 +-
.../discovery/GridDiscoveryManager.java | 6 +
.../GridCachePartitionExchangeManager.java | 6 +-
.../processors/cache/GridCacheProcessor.java | 62 ++++-
.../processors/rest/GridRestProcessor.java | 4 +-
.../handlers/task/GridTaskCommandHandler.java | 12 +-
.../processors/task/GridTaskWorker.java | 4 +-
.../apache/ignite/internal/visor/VisorJob.java | 2 +
.../internal/visor/log/VisorLogSearchTask.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 4 +
.../visor/query/VisorQueryCleanupTask.java | 14 +
.../util/VisorClusterGroupEmptyException.java | 37 +++
.../ignite/spi/discovery/tcp/ClientImpl.java | 151 ++++++-----
.../ignite/spi/discovery/tcp/ServerImpl.java | 103 +++++--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../internal/ClusterForHostsSelfTest.java | 113 --------
.../internal/ClusterGroupHostsSelfTest.java | 141 ++++++++++
.../cache/GridCacheDaemonNodeStopSelfTest.java | 119 ---------
.../IgniteDaemonNodeMarshallerCacheTest.java | 192 ++++++++++++++
...achePartitionedMultiNodeFullApiSelfTest.java | 4 +-
.../tcp/TcpClientDiscoverySpiSelfTest.java | 265 ++++++++++++++++++-
.../ignite/testsuites/IgniteBasicTestSuite.java | 3 +-
.../testsuites/IgniteCacheTestSuite3.java | 1 -
pom.xml | 12 +-
27 files changed, 947 insertions(+), 343 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be973e23/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
[03/12] incubator-ignite git commit: Merge branch 'ignite-sprint-7'
into ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-sprint-7' into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f57eca7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f57eca7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f57eca7
Branch: refs/heads/ignite-1058
Commit: 8f57eca7af68b94b7574845c3662bf4bf05da57b
Parents: c86f8f9 3e8ddb4
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jun 26 09:23:19 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jun 26 09:23:19 2015 +0300
----------------------------------------------------------------------
scripts/git-patch-prop.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[11/12] incubator-ignite git commit: Merge branch 'ignite-gg-10298'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into
ignite-gg-10298
Posted by sb...@apache.org.
Merge branch 'ignite-gg-10298' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10298
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23a3f109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23a3f109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23a3f109
Branch: refs/heads/ignite-1058
Commit: 23a3f1099cd4ac678fc3e8f4d200f1b80c4dd64e
Parents: e428f42 b843dab
Author: iveselovskiy <iv...@gridgain.com>
Authored: Mon Jun 29 18:46:45 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Mon Jun 29 18:46:45 2015 +0300
----------------------------------------------------------------------
----------------------------------------------------------------------