Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-23
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12761e44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12761e44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12761e44 Branch: refs/heads/ignite-23 Commit: 12761e44013e51cf2fb787ec0d7edf6cd6cc1fd8 Parents: d299316 Author: sboikov <sboi...@gridgain.com> Authored: Thu May 21 10:12:42 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu May 21 10:19:27 2015 +0300 ---------------------------------------------------------------------- .../processors/affinity/GridAffinityAssignmentCache.java | 2 ++ .../internal/processors/cache/GridCacheAffinityManager.java | 1 + .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 9 +-------- 3 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12761e44/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java index 18ac65a..2992a6c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java @@ -103,6 +103,8 @@ public class GridAffinityAssignmentCache { } /** + * Copies previous affinity assignment when client node joins on leaves. + * * @param node Node. * @param topVer Topology version. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12761e44/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java index 6541e9a..20fca7e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityManager.java @@ -149,6 +149,7 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { } /** + * Copies previous affinity assignment when client node joins on leaves. * * @param node Node. * @param topVer Topology version. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12761e44/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 5a5c490..9315b28 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -1045,13 +1045,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } ClusterNode node = ctx.discovery().node(nodeId); - // Do not check topology version for CLOCK versioning since - // partition exchange will wait for near update future. - // Also do not check topology version if topology was locked on near node by - // external transaction or explicit lock. - if (topology().topologyVersion().equals(req.topologyVersion()) || req.topologyLocked() || - ctx.config().getAtomicWriteOrderMode() == CLOCK) { - ClusterNode node = ctx.discovery().node(nodeId); if (node == null) { U.warn(log, "Node originated update request left grid: " + nodeId); @@ -1168,7 +1161,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { } } catch (GridDhtInvalidPartitionException ignore) { - assert !req.fastMap() || clientReq; + assert !req.fastMap() || clientReq : req; if (log.isDebugEnabled()) log.debug("Caught invalid partition exception for cache entry (will remap update request): " + req);
