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/09/30 14:49:08 UTC
[1/8] ignite git commit: ignite-1329 Removed outdated code from
GridCacheIoManager
Repository: ignite
Updated Branches:
refs/heads/ignite-1534 9bc077ed0 -> 879fcc9c1
ignite-1329 Removed outdated code from GridCacheIoManager
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cd439672
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cd439672
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cd439672
Branch: refs/heads/ignite-1534
Commit: cd439672847d764838075b7eafae504ce27d0563
Parents: c6ec7e1
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 30 13:43:41 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 30 13:43:41 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 76 +-------------------
.../processors/cache/GridCacheMessage.java | 7 --
.../cache/GridCacheSharedContext.java | 32 ---------
.../processors/cache/GridCacheUtils.java | 8 ---
.../dht/GridDhtAffinityAssignmentRequest.java | 5 --
.../dht/GridDhtAffinityAssignmentResponse.java | 5 --
.../distributed/dht/GridDhtLockRequest.java | 5 --
.../distributed/dht/GridDhtTxFinishRequest.java | 5 --
.../dht/GridDhtTxPrepareRequest.java | 7 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 5 --
.../dht/preloader/GridDhtForceKeysResponse.java | 5 --
.../GridDhtPartitionDemandMessage.java | 5 --
.../GridDhtPartitionSupplyMessage.java | 5 --
.../GridDhtPartitionsAbstractMessage.java | 5 --
14 files changed, 4 insertions(+), 171 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 421ec82..c81dae5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -270,62 +270,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
if (cacheMsg.classError() != null)
processFailedMessage(nodeId, cacheMsg);
- else {
- if (cacheMsg.allowForStartup())
- processMessage(nodeId, cacheMsg, c);
- else {
- IgniteInternalFuture<?> startFut = startFuture(cacheMsg);
-
- if (startFut.isDone())
- processMessage(nodeId, cacheMsg, c);
- else {
- if (log.isDebugEnabled())
- log.debug("Waiting for start future to complete for message [nodeId=" + nodeId +
- ", locId=" + cctx.localNodeId() + ", msg=" + cacheMsg + ']');
-
- // Don't hold this thread waiting for preloading to complete.
- startFut.listen(new CI1<IgniteInternalFuture<?>>() {
- @Override public void apply(final IgniteInternalFuture<?> f) {
- cctx.kernalContext().closure().runLocalSafe(
- new GridPlainRunnable() {
- @Override public void run() {
- rw.readLock();
-
- try {
- if (stopping) {
- if (log.isDebugEnabled())
- log.debug("Received cache communication message while stopping " +
- "(will ignore) [nodeId=" + nodeId + ", msg=" + cacheMsg + ']');
-
- return;
- }
-
- f.get();
-
- if (log.isDebugEnabled())
- log.debug("Start future completed for message [nodeId=" + nodeId +
- ", locId=" + cctx.localNodeId() + ", msg=" + cacheMsg + ']');
-
- processMessage(nodeId, cacheMsg, c);
- }
- catch (IgniteCheckedException e) {
- // Log once.
- if (startErr.compareAndSet(false, true))
- U.error(log, "Failed to complete preload start future " +
- "(will ignore message) " +
- "[fut=" + f + ", nodeId=" + nodeId + ", msg=" + cacheMsg + ']', e);
- }
- finally {
- rw.readUnlock();
- }
- }
- }
- );
- }
- });
- }
- }
- }
+ else
+ processMessage(nodeId, cacheMsg, c);
}
catch (Throwable e) {
U.error(log, "Failed to process message [senderId=" + nodeId + ", messageType=" + cacheMsg.getClass() + ']', e);
@@ -549,24 +495,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter {
}
/**
- * @param cacheMsg Cache message to get start future.
- * @return Preloader start future.
- */
- @SuppressWarnings("unchecked")
- private IgniteInternalFuture<Object> startFuture(GridCacheMessage cacheMsg) {
- int cacheId = cacheMsg.cacheId();
-
- if (cacheId != 0)
- return cctx.cacheContext(cacheId).preloader().startFuture();
- else {
- if (F.eq(cacheMsg.topologyVersion(), AffinityTopologyVersion.NONE))
- return new GridFinishedFuture<>();
-
- return cctx.preloadersStartFuture(cacheMsg.topologyVersion());
- }
- }
-
- /**
* @param nodeId Node ID.
* @param msg Message.
* @param c Closure.
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
index 55688e4..4b700e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java
@@ -93,13 +93,6 @@ public abstract class GridCacheMessage implements Message {
}
/**
- * @return {@code True} if this message is preloader message.
- */
- public boolean allowForStartup() {
- return false;
- }
-
- /**
* @return {@code True} if this message is partition exchange message.
*/
public boolean partitionExchangeMessage() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 13e390a..c5d4162 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -333,38 +333,6 @@ public class GridCacheSharedContext<K, V> {
}
/**
- * @return Compound preloaders start future.
- */
- public IgniteInternalFuture<Object> preloadersStartFuture(AffinityTopologyVersion topVer) {
- if (preloadersStartFut == null) {
- GridCompoundFuture<Object, Object> compound = null;
-
- for (GridCacheContext<?, ?> cacheCtx : cacheContexts()) {
- if (cacheCtx.startTopologyVersion() != null && cacheCtx.startTopologyVersion().compareTo(topVer) <= 0) {
- IgniteInternalFuture<Object> startFut = cacheCtx.preloader().startFuture();
-
- if (!startFut.isDone()) {
- if (compound == null)
- compound = new GridCompoundFuture<>();
-
- compound.add(startFut);
- }
- }
- }
-
- if (compound != null) {
- compound.markInitialized();
-
- return preloadersStartFut = compound;
- }
- else
- return preloadersStartFut = new GridFinishedFuture<>();
- }
- else
- return preloadersStartFut;
- }
-
- /**
* @return Transactional metrics adapter.
*/
public TransactionMetricsAdapter txMetrics() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 2d5698a..7854c93 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -286,14 +286,6 @@ public class GridCacheUtils {
}
/**
- * @param msg Message to check.
- * @return {@code True} if preloader message.
- */
- public static boolean allowForStartup(Object msg) {
- return ((GridCacheMessage)msg).allowForStartup();
- }
-
- /**
* Writes {@link GridCacheVersion} to output stream. This method is meant to be used by
* implementations of {@link Externalizable} interface.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
index 6381073..e6a5c9a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentRequest.java
@@ -52,11 +52,6 @@ public class GridDhtAffinityAssignmentRequest extends GridCacheMessage {
}
/** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public boolean partitionExchangeMessage() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
index 139100f..2798d7c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtAffinityAssignmentResponse.java
@@ -70,11 +70,6 @@ public class GridDhtAffinityAssignmentResponse extends GridCacheMessage {
}
/** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public boolean partitionExchangeMessage() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index cf4b581..87aa256 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -171,11 +171,6 @@ public class GridDhtLockRequest extends GridDistributedLockRequest {
this.accessTtl = accessTtl;
}
- /** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
/**
* @return Near node ID.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index f859314..be59a95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -159,11 +159,6 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest {
this.taskNameHash = taskNameHash;
}
- /** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
/**
* @return Mini ID.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index 5f9443b..29d5a70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -164,11 +164,6 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
return nearXidVer;
}
- /** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
/**
* @return Near node ID.
*/
@@ -215,6 +210,8 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest {
/**
* Marks last added key for preloading.
+ *
+ * @param idx Key index.
*/
public void markKeyForPreload(int idx) {
if (preloadKeys == null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index 3268e26..fac8b9b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -90,11 +90,6 @@ public class GridDhtForceKeysRequest extends GridCacheMessage implements GridCac
// No-op.
}
- /** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
/**
* @param keys Collection of keys.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index 93e39ce..9418887 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -103,11 +103,6 @@ public class GridDhtForceKeysResponse extends GridCacheMessage implements GridCa
return err;
}
- /** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
/**
* @return Keys.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
index b588372..b211d27 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandMessage.java
@@ -99,11 +99,6 @@ public class GridDhtPartitionDemandMessage extends GridCacheMessage {
// No-op.
}
- /** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
/**
* @param p Partition.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
index 3ccc5ae..67c08bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyMessage.java
@@ -96,11 +96,6 @@ public class GridDhtPartitionSupplyMessage extends GridCacheMessage implements G
}
/** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public boolean ignoreClassErrors() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cd439672/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
index cc7d439..041d5f0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java
@@ -56,11 +56,6 @@ abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage {
}
/** {@inheritDoc} */
- @Override public boolean allowForStartup() {
- return true;
- }
-
- /** {@inheritDoc} */
@Override public boolean partitionExchangeMessage() {
return true;
}
[4/8] ignite git commit: # master - changed "ssl" to "tls/ssl"
Posted by sb...@apache.org.
# master - changed "ssl" to "tls/ssl"
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f3808831
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f3808831
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f3808831
Branch: refs/heads/ignite-1534
Commit: f3808831a8df1b67b81a92f50cd2b23c3358e604
Parents: c6ec7e1
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Sep 30 14:19:13 2015 +0200
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Sep 30 14:19:13 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f3808831/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 68a0383..c02dc59 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
@@ -2177,7 +2177,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
assert log != null;
U.quietAndInfo(log, "Security status [authentication=" + onOff(ctx.security().enabled())
- + ", ssl=" + onOff(ctx.config().getSslContextFactory() != null) + ']');
+ + ", tls/ssl=" + onOff(ctx.config().getSslContextFactory() != null) + ']');
}
/**
[2/8] ignite git commit: ignite-1564 Fixed client cache reconnect
issues
Posted by sb...@apache.org.
ignite-1564 Fixed client cache reconnect issues
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/273f291d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/273f291d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/273f291d
Branch: refs/heads/ignite-1534
Commit: 273f291d9fac0919d57b9ed732564b323a956f90
Parents: cd43967
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 30 13:48:48 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 30 13:48:48 2015 +0300
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 22 +--
.../processors/cache/GridCacheEventManager.java | 12 +-
.../processors/cache/GridCacheProcessor.java | 68 +++++---
.../dht/preloader/GridDhtPreloader.java | 6 +
.../IgniteClientReconnectAbstractTest.java | 35 ++++-
.../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++
6 files changed, 249 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 785613d..aec36a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -78,7 +78,7 @@ import org.apache.ignite.internal.processors.jobmetrics.GridJobMetrics;
import org.apache.ignite.internal.processors.security.SecurityContext;
import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
import org.apache.ignite.internal.util.F0;
-import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
+import org.apache.ignite.internal.util.GridBoundedConcurrentOrderedMap;
import org.apache.ignite.internal.util.GridSpinBusyLock;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
import org.apache.ignite.internal.util.future.GridFutureAdapter;
@@ -208,7 +208,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** Topology cache history. */
private final Map<AffinityTopologyVersion, DiscoCache> discoCacheHist =
- new GridBoundedConcurrentLinkedHashMap<>(DISCOVERY_HISTORY_SIZE, DISCOVERY_HISTORY_SIZE, 0.7f, 1);
+ new GridBoundedConcurrentOrderedMap<>(DISCOVERY_HISTORY_SIZE);
/** Topology snapshots history. */
private volatile Map<Long, Collection<ClusterNode>> topHist = new HashMap<>();
@@ -465,14 +465,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
final Map<Long, Collection<ClusterNode>> snapshots,
@Nullable DiscoverySpiCustomMessage spiCustomMsg
) {
- if (type == EVT_NODE_JOINED && node.isLocal() && ctx.clientDisconnected()) {
- discoCacheHist.clear();
-
- topHist.clear();
-
- topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO, null));
- }
-
DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null
: ((CustomMessageWrapper)spiCustomMsg).delegate();
@@ -593,6 +585,13 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
locJoinEvt = new GridFutureAdapter<>();
registeredCaches.clear();
+
+ discoCacheHist.clear();
+
+ topHist.clear();
+
+ topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO,
+ new DiscoCache(locNode, Collections.<ClusterNode>emptySet())));
}
else if (type == EVT_CLIENT_NODE_RECONNECTED) {
assert locNode.isClient() : locNode;
@@ -620,7 +619,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
return;
}
- discoWrk.addEvent(type, nextTopVer, node, topSnapshot, customMsg);
+ if (type == EVT_CLIENT_NODE_DISCONNECTED || type == EVT_NODE_SEGMENTED || !ctx.clientDisconnected())
+ discoWrk.addEvent(type, nextTopVer, node, topSnapshot, customMsg);
}
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
index c2f8f3f..751c316 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java
@@ -40,14 +40,6 @@ import static org.apache.ignite.events.EventType.EVT_CACHE_STOPPED;
* Cache event manager.
*/
public class GridCacheEventManager extends GridCacheManagerAdapter {
- /** Local node ID. */
- private UUID locNodeId;
-
- /** {@inheritDoc} */
- @Override public void start0() {
- locNodeId = cctx.localNodeId();
- }
-
/**
* Adds local event listener.
*
@@ -96,7 +88,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter {
{
addEvent(part,
key,
- locNodeId,
+ cctx.localNodeId(),
tx,
owner,
type,
@@ -116,7 +108,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter {
addEvent(
0,
null,
- locNodeId,
+ cctx.localNodeId(),
(IgniteUuid)null,
null,
type,
http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index c86dfd9..6c13399 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -26,6 +26,7 @@ import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
@@ -197,6 +198,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
/** */
private Map<String, DynamicCacheDescriptor> cachesOnDisconnect;
+ /** */
+ private Map<UUID, DynamicCacheChangeBatch> clientReconnectReqs;
+
/**
* @param ctx Kernal context.
*/
@@ -1050,6 +1054,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
}
+ if (clientReconnectReqs != null) {
+ for (Map.Entry<UUID, DynamicCacheChangeBatch> e : clientReconnectReqs.entrySet())
+ processClientReconnectData(e.getKey(), e.getValue());
+
+ clientReconnectReqs = null;
+ }
+
sharedCtx.onReconnected();
for (GridCacheAdapter cache : reconnected)
@@ -1881,28 +1892,16 @@ public class GridCacheProcessor extends GridProcessorAdapter {
DynamicCacheChangeBatch batch = (DynamicCacheChangeBatch)data;
if (batch.clientReconnect()) {
- for (DynamicCacheChangeRequest req : batch.requests()) {
- assert !req.template() : req;
-
- String name = req.cacheName();
-
- boolean sysCache = CU.isMarshallerCache(name) || CU.isUtilityCache(name) || CU.isAtomicsCache(name);
+ if (ctx.clientDisconnected()) {
+ if (clientReconnectReqs == null)
+ clientReconnectReqs = new LinkedHashMap<>();
- if (!sysCache) {
- DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
+ clientReconnectReqs.put(joiningNodeId, batch);
- if (desc != null && desc.deploymentId().equals(req.deploymentId())) {
- Map<UUID, Boolean> nodes = batch.clientNodes().get(name);
-
- assert nodes != null : req;
- assert nodes.containsKey(joiningNodeId) : nodes;
-
- ctx.discovery().addClientNode(req.cacheName(), joiningNodeId, nodes.get(joiningNodeId));
- }
- }
- else
- ctx.discovery().addClientNode(req.cacheName(), joiningNodeId, false);
+ return;
}
+
+ processClientReconnectData(joiningNodeId, batch);
}
else {
for (DynamicCacheChangeRequest req : batch.requests()) {
@@ -1983,6 +1982,37 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
+ * @param clientNodeId Client node ID.
+ * @param batch Cache change batch.
+ */
+ private void processClientReconnectData(UUID clientNodeId, DynamicCacheChangeBatch batch) {
+ assert batch.clientReconnect() : batch;
+
+ for (DynamicCacheChangeRequest req : batch.requests()) {
+ assert !req.template() : req;
+
+ String name = req.cacheName();
+
+ boolean sysCache = CU.isMarshallerCache(name) || CU.isUtilityCache(name) || CU.isAtomicsCache(name);
+
+ if (!sysCache) {
+ DynamicCacheDescriptor desc = registeredCaches.get(maskNull(req.cacheName()));
+
+ if (desc != null && desc.deploymentId().equals(req.deploymentId())) {
+ Map<UUID, Boolean> nodes = batch.clientNodes().get(name);
+
+ assert nodes != null : req;
+ assert nodes.containsKey(clientNodeId) : nodes;
+
+ ctx.discovery().addClientNode(req.cacheName(), clientNodeId, nodes.get(clientNodeId));
+ }
+ }
+ else
+ ctx.discovery().addClientNode(req.cacheName(), clientNodeId, false);
+ }
+ }
+
+ /**
* Dynamically starts cache using template configuration.
*
* @param cacheName Cache name.
http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 9d5fdca..19b461e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -260,6 +260,12 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
/** {@inheritDoc} */
@Override public void onReconnected() {
startFut = new GridFutureAdapter<>();
+
+ long topVer0 = cctx.kernalContext().discovery().topologyVersion();
+
+ assert topVer0 > 0 : topVer0;
+
+ topVer.set(topVer0);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index 3a6d04f..0c1df7f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -19,6 +19,8 @@ package org.apache.ignite.internal;
import java.io.IOException;
import java.net.Socket;
+import java.util.Collections;
+import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -199,15 +201,28 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
*/
protected void reconnectClientNode(Ignite client, Ignite srv, @Nullable Runnable disconnectedC)
throws Exception {
- final TestTcpDiscoverySpi clientSpi = spi(client);
+ reconnectClientNodes(Collections.singletonList(client), srv, disconnectedC);
+ }
+
+ /**
+ * Reconnect client node.
+ *
+ * @param clients Clients.
+ * @param srv Server.
+ * @param disconnectedC Closure which will be run when client node disconnected.
+ * @throws Exception If failed.
+ */
+ protected void reconnectClientNodes(List<Ignite> clients, Ignite srv, @Nullable Runnable disconnectedC)
+ throws Exception {
final TestTcpDiscoverySpi srvSpi = spi(srv);
- final CountDownLatch disconnectLatch = new CountDownLatch(1);
- final CountDownLatch reconnectLatch = new CountDownLatch(1);
+ final CountDownLatch disconnectLatch = new CountDownLatch(clients.size());
+ final CountDownLatch reconnectLatch = new CountDownLatch(clients.size());
log.info("Block reconnect.");
- clientSpi.writeLatch = new CountDownLatch(1);
+ for (Ignite client : clients)
+ spi(client).writeLatch = new CountDownLatch(1);
IgnitePredicate<Event> p = new IgnitePredicate<Event>() {
@Override public boolean apply(Event evt) {
@@ -226,9 +241,11 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
}
};
- client.events().localListen(p, EVT_CLIENT_NODE_DISCONNECTED, EVT_CLIENT_NODE_RECONNECTED);
+ for (Ignite client : clients)
+ client.events().localListen(p, EVT_CLIENT_NODE_DISCONNECTED, EVT_CLIENT_NODE_RECONNECTED);
- srvSpi.failNode(client.cluster().localNode().id(), null);
+ for (Ignite client : clients)
+ srvSpi.failNode(client.cluster().localNode().id(), null);
waitReconnectEvent(disconnectLatch);
@@ -237,11 +254,13 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
log.info("Allow reconnect.");
- clientSpi.writeLatch.countDown();
+ for (Ignite client : clients)
+ spi(client).writeLatch.countDown();
waitReconnectEvent(reconnectLatch);
- client.events().stopLocalListen(p);
+ for (Ignite client : clients)
+ client.events().stopLocalListen(p);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/273f291d/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
index 807027c..edd95e9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java
@@ -40,6 +40,7 @@ import org.apache.ignite.Ignition;
import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -998,6 +999,159 @@ public class IgniteClientReconnectCacheTest extends IgniteClientReconnectAbstrac
}
/**
+ * @throws Exception If failed.
+ */
+ public void testReconnectClusterRestartMultinode() throws Exception {
+ clientMode = true;
+
+ final int CLIENTS = 5;
+
+ CountDownLatch disconnectLatch = new CountDownLatch(CLIENTS);
+ CountDownLatch reconnectLatch = new CountDownLatch(CLIENTS);
+
+ List<IgniteCache> caches = new ArrayList<>();
+
+ for (int i = 0; i < CLIENTS; i++) {
+ Ignite client = startGrid(SRV_CNT + i);
+
+ addListener(client, disconnectLatch, reconnectLatch);
+
+ IgniteCache cache = client.getOrCreateCache(new CacheConfiguration<>());
+
+ assertNotNull(cache);
+
+ caches.add(cache);
+ }
+
+ for (int i = 0; i < SRV_CNT; i++)
+ stopGrid(i);
+
+ assertTrue(disconnectLatch.await(30_000, MILLISECONDS));
+
+ log.info("Restart servers.");
+
+ clientMode = false;
+
+ startGridsMultiThreaded(0, SRV_CNT);
+
+ assertTrue(reconnectLatch.await(30_000, MILLISECONDS));
+
+ for (final IgniteCache clientCache : caches) {
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ return clientCache.get(1);
+ }
+ }, IllegalStateException.class, null);
+ }
+
+ for (int i = 0; i < SRV_CNT + CLIENTS; i++) {
+ Ignite ignite = grid(i);
+
+ ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+
+ assertEquals(0, grp.nodes().size());
+
+ grp = ignite.cluster().forClientNodes(null);
+
+ assertEquals(0, grp.nodes().size());
+ }
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testReconnectMultinode() throws Exception {
+ grid(0).createCache(new CacheConfiguration<>());
+
+ clientMode = true;
+
+ final int CLIENTS = 2;
+
+ List<Ignite> clients = new ArrayList<>();
+
+ for (int i = 0; i < CLIENTS; i++) {
+ Ignite client = startGrid(SRV_CNT + i);
+
+ assertNotNull(client.getOrCreateCache(new CacheConfiguration<>()));
+
+ clients.add(client);
+ }
+
+ int nodes = SRV_CNT + CLIENTS;
+ int srvNodes = SRV_CNT;
+
+ for (int iter = 0; iter < 3; iter++) {
+ log.info("Iteration: " + iter);
+
+ reconnectClientNodes(clients, grid(0), null);
+
+ for (Ignite client : clients) {
+ IgniteCache<Object, Object> cache = client.cache(null);
+
+ assertNotNull(cache);
+
+ cache.put(client.name(), 1);
+
+ assertEquals(1, cache.get(client.name()));
+
+ ClusterGroup grp = client.cluster().forCacheNodes(null);
+
+ assertEquals(CLIENTS + srvNodes, grp.nodes().size());
+
+ grp = client.cluster().forClientNodes(null);
+
+ assertEquals(CLIENTS, grp.nodes().size());
+ }
+
+ for (int i = 0; i < nodes; i++) {
+ Ignite ignite = grid(i);
+
+ ClusterGroup grp = ignite.cluster().forCacheNodes(null);
+
+ assertEquals(CLIENTS + srvNodes, grp.nodes().size());
+
+ grp = ignite.cluster().forClientNodes(null);
+
+ assertEquals(CLIENTS, grp.nodes().size());
+ }
+
+ clientMode = false;
+
+ startGrid(nodes++);
+
+ srvNodes++;
+
+ clientMode = true;
+
+ startGrid(nodes++);
+ }
+ }
+
+ /**
+ * @param client Client.
+ * @param disconnectLatch Disconnect event latch.
+ * @param reconnectLatch Reconnect event latch.
+ */
+ private void addListener(Ignite client, final CountDownLatch disconnectLatch, final CountDownLatch reconnectLatch) {
+ client.events().localListen(new IgnitePredicate<Event>() {
+ @Override public boolean apply(Event evt) {
+ if (evt.type() == EVT_CLIENT_NODE_DISCONNECTED) {
+ info("Disconnected: " + evt);
+
+ disconnectLatch.countDown();
+ }
+ else if (evt.type() == EVT_CLIENT_NODE_RECONNECTED) {
+ info("Reconnected: " + evt);
+
+ reconnectLatch.countDown();
+ }
+
+ return true;
+ }
+ }, EVT_CLIENT_NODE_DISCONNECTED, EVT_CLIENT_NODE_RECONNECTED);
+ }
+
+ /**
*
*/
static class TestClass1 implements Serializable {}
[7/8] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52600f30
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52600f30
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52600f30
Branch: refs/heads/ignite-1534
Commit: 52600f30dca8397f417a53611231d1ad3e66454b
Parents: 7571f21 de39fbf
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:44:07 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:44:07 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[8/8] ignite git commit: ignite-1534 debug
Posted by sb...@apache.org.
ignite-1534 debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/879fcc9c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/879fcc9c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/879fcc9c
Branch: refs/heads/ignite-1534
Commit: 879fcc9c18a0933a8910a7c837b8f1b0de92ece4
Parents: 9bc077e 52600f3
Author: sboikov <sb...@gridgain.com>
Authored: Wed Sep 30 15:48:54 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Sep 30 15:48:54 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 2 +-
.../discovery/GridDiscoveryManager.java | 22 +--
.../processors/cache/GridCacheEventManager.java | 12 +-
.../processors/cache/GridCacheIoManager.java | 76 +--------
.../processors/cache/GridCacheMessage.java | 7 -
.../processors/cache/GridCacheProcessor.java | 68 +++++---
.../cache/GridCacheSharedContext.java | 32 ----
.../processors/cache/GridCacheUtils.java | 8 -
.../dht/GridDhtAffinityAssignmentRequest.java | 5 -
.../dht/GridDhtAffinityAssignmentResponse.java | 5 -
.../distributed/dht/GridDhtLockRequest.java | 5 -
.../distributed/dht/GridDhtTxFinishRequest.java | 5 -
.../dht/GridDhtTxPrepareRequest.java | 7 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 5 -
.../dht/preloader/GridDhtForceKeysResponse.java | 5 -
.../GridDhtPartitionDemandMessage.java | 5 -
.../GridDhtPartitionSupplyMessage.java | 5 -
.../GridDhtPartitionsAbstractMessage.java | 5 -
.../dht/preloader/GridDhtPreloader.java | 6 +
.../IgniteClientReconnectAbstractTest.java | 35 ++++-
.../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++
.../IgniteCacheP2pUnmarshallingErrorTest.java | 7 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +-
.../dht/IgniteCrossCacheTxSelfTest.java | 6 +-
24 files changed, 270 insertions(+), 229 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/879fcc9c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index f977d92,aec36a2..a6dbfc9
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@@ -465,16 -465,6 +465,8 @@@ public class GridDiscoveryManager exten
final Map<Long, Collection<ClusterNode>> snapshots,
@Nullable DiscoverySpiCustomMessage spiCustomMsg
) {
+ U.sleep();
+
- if (type == EVT_NODE_JOINED && node.isLocal() && ctx.clientDisconnected()) {
- discoCacheHist.clear();
-
- topHist.clear();
-
- topSnap.set(new Snapshot(AffinityTopologyVersion.ZERO, null));
- }
-
DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null
: ((CustomMessageWrapper)spiCustomMsg).delegate();
http://git-wip-us.apache.org/repos/asf/ignite/blob/879fcc9c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
[5/8] ignite git commit: Merge remote-tracking branch 'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de39fbf2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de39fbf2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de39fbf2
Branch: refs/heads/ignite-1534
Commit: de39fbf269ad6f834ab01444558ea2dced1c2035
Parents: f380883 1282f8b
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Wed Sep 30 14:19:28 2015 +0200
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Wed Sep 30 14:19:28 2015 +0200
----------------------------------------------------------------------
.../discovery/GridDiscoveryManager.java | 22 +--
.../processors/cache/GridCacheEventManager.java | 12 +-
.../processors/cache/GridCacheIoManager.java | 76 +--------
.../processors/cache/GridCacheMessage.java | 7 -
.../processors/cache/GridCacheProcessor.java | 68 +++++---
.../cache/GridCacheSharedContext.java | 32 ----
.../processors/cache/GridCacheUtils.java | 8 -
.../dht/GridDhtAffinityAssignmentRequest.java | 5 -
.../dht/GridDhtAffinityAssignmentResponse.java | 5 -
.../distributed/dht/GridDhtLockRequest.java | 5 -
.../distributed/dht/GridDhtTxFinishRequest.java | 5 -
.../dht/GridDhtTxPrepareRequest.java | 7 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 5 -
.../dht/preloader/GridDhtForceKeysResponse.java | 5 -
.../GridDhtPartitionDemandMessage.java | 5 -
.../GridDhtPartitionSupplyMessage.java | 5 -
.../GridDhtPartitionsAbstractMessage.java | 5 -
.../dht/preloader/GridDhtPreloader.java | 6 +
.../IgniteClientReconnectAbstractTest.java | 35 ++++-
.../IgniteClientReconnectCacheTest.java | 154 +++++++++++++++++++
.../IgniteCacheP2pUnmarshallingErrorTest.java | 7 +
...CacheP2pUnmarshallingRebalanceErrorTest.java | 12 +-
22 files changed, 266 insertions(+), 225 deletions(-)
----------------------------------------------------------------------
[6/8] ignite git commit: Test fix
Posted by sb...@apache.org.
Test fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7571f211
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7571f211
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7571f211
Branch: refs/heads/ignite-1534
Commit: 7571f211ea85854854f08b9d2cecaff9850e126d
Parents: 1282f8b
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:43:40 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:43:40 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/IgniteCrossCacheTxSelfTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7571f211/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
index bf9b1c6..dc0293e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -148,11 +148,11 @@ public class IgniteCrossCacheTxSelfTest extends GridCommonAbstractTest {
for (int i = 0; i < TX_CNT; i++) {
int grid = ThreadLocalRandom8.current().nextInt(nodeCount());
+ IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
+ IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
+
try (Transaction tx = grid(grid).transactions().txStart(concurrency, isolation)) {
try {
- IgniteCache<Integer, String> first = grid(grid).cache(FIRST_CACHE);
- IgniteCache<Integer, String> second = grid(grid).cache(SECOND_CACHE);
-
int size = ThreadLocalRandom8.current().nextInt(24) + 1;
for (int k = 0; k < size; k++) {
[3/8] ignite git commit: Test fix
Posted by sb...@apache.org.
Test fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1282f8b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1282f8b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1282f8b1
Branch: refs/heads/ignite-1534
Commit: 1282f8b1ddc248e562ecb937bce84acabb8198f7
Parents: 273f291
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Sep 30 15:16:31 2015 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Sep 30 15:16:31 2015 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheP2pUnmarshallingErrorTest.java | 7 +++++++
.../IgniteCacheP2pUnmarshallingRebalanceErrorTest.java | 12 ++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1282f8b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
index b62cc48..1b2b84d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingErrorTest.java
@@ -27,6 +27,7 @@ import org.apache.ignite.cache.CacheAtomicWriteOrderMode;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.query.annotations.QuerySqlField;
+import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.internal.util.typedef.X;
@@ -76,6 +77,12 @@ public class IgniteCacheP2pUnmarshallingErrorTest extends IgniteCacheAbstractTes
cfg.setCacheConfiguration();
}
+ if (getTestGridName(10).equals(gridName)) {
+
+ CacheConfiguration cc = cfg.getCacheConfiguration()[0];
+ cc.setRebalanceDelay(-1);
+ }
+
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/1282f8b1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
index 9faeac8..73388fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingRebalanceErrorTest.java
@@ -52,20 +52,20 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2
readCnt.set(Integer.MAX_VALUE);
- for (int i = 0; i <= 1000; i++)
+ for (int i = 0; i <= 100; i++)
jcache(0).put(new TestKey(String.valueOf(++key)), "");
- startGrid(3);
+ startGrid(10); //custom rebalanceDelay set at cfg.
- Affinity<Object> aff = affinity(grid(3).cache(null));
+ Affinity<Object> aff = affinity(grid(10).cache(null));
- while (!aff.isPrimary(grid(3).localNode(), new TestKey(String.valueOf(key))))
+ while (!aff.isPrimary(grid(10).localNode(), new TestKey(String.valueOf(key))))
--key;
readCnt.set(1);
try {
- jcache(3).get(new TestKey(String.valueOf(key)));
+ jcache(10).get(new TestKey(String.valueOf(key)));
assert false : "p2p marshalling failed, but error response was not sent";
}
@@ -73,4 +73,4 @@ public class IgniteCacheP2pUnmarshallingRebalanceErrorTest extends IgniteCacheP2
assert X.hasCause(e, IOException.class);
}
}
-}
\ No newline at end of file
+}