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 2017/07/13 14:35:56 UTC
[27/50] ignite git commit: ignite-5578 aff on join
ignite-5578 aff on join
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3261d084
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3261d084
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3261d084
Branch: refs/heads/ignite-5578
Commit: 3261d08433264378cae8a2b9fc49c4843de6b517
Parents: a732afc
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 12 08:39:03 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 12 09:04:18 2017 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/preloader/CacheGroupAffinity.java | 3 +++
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 5 +++--
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3261d084/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinity.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinity.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinity.java
index e29ee06..1e1509a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinity.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinity.java
@@ -33,6 +33,9 @@ import org.apache.ignite.plugin.extensions.communication.MessageWriter;
*/
public class CacheGroupAffinity implements Message {
/** */
+ private static final long serialVersionUID = 0L;
+
+ /** */
private int grpId;
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/3261d084/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index a767f2a..1039392 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -2002,9 +2002,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
int cnt = 0;
for (CacheGroupAffinity aff : cachesAff) {
- CacheGroupContext grp = cctx.cache().cacheGroup(aff.groupId());
+ if (affReq.contains(aff.groupId())) {
+ CacheGroupContext grp = cctx.cache().cacheGroup(aff.groupId());
- if (grp != null) {
+ assert grp != null : aff.groupId();
assert AffinityTopologyVersion.NONE.equals(grp.affinity().lastVersion());
List<GridLongList> assignments = aff.assignments();