Repository: ignite Updated Branches: refs/heads/ignite-5578 760adcab1 -> 952ca3dc3
ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/952ca3dc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/952ca3dc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/952ca3dc Branch: refs/heads/ignite-5578 Commit: 952ca3dc30372f27ab488463136fccb4341c2f1e Parents: 760adca Author: sboikov <[email protected]> Authored: Wed Aug 2 12:37:02 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Aug 2 12:37:02 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheAffinitySharedManager.java | 4 ++-- .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/952ca3dc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index 1ff2b56..f33c355 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -1323,8 +1323,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap aff.calculate(evts.topologyVersion(), evts.lastEvent(), evts.discoveryCache()); aff.initialize(evts.topologyVersion(), assignments); - - grp.topology().initPartitionsWhenAffinityReady(resTopVer, fut); } else if (fut.cacheGroupAddedOnExchange(aff.groupId(), grp.receivedFrom())) { List<List<ClusterNode>> assignment = aff.calculate(evts.topologyVersion(), @@ -1333,6 +1331,8 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap aff.initialize(evts.topologyVersion(), assignment); } + + grp.topology().initPartitionsWhenAffinityReady(resTopVer, fut); } }); } http://git-wip-us.apache.org/repos/asf/ignite/blob/952ca3dc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java index bbc3962..9851be8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java @@ -1315,7 +1315,7 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { GridDhtPartitionMap nodeMap = partMap.get(ctx.localNodeId()); - if (nodeMap != null && ctx.database().persistenceEnabled()) { + if (nodeMap != null && ctx.database().persistenceEnabled() && readyTopVer.initialized()) { for (Map.Entry<Integer, GridDhtPartitionState> e : nodeMap.entrySet()) { int p = e.getKey(); GridDhtPartitionState state = e.getValue(); @@ -1323,7 +1323,7 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { if (state == OWNING) { GridDhtLocalPartition locPart = locParts.get(p); - assert locPart != null; + assert locPart != null : grp.cacheOrGroupName(); if (incomeCntrMap != null) { T2<Long, Long> cntr = incomeCntrMap.get(p);
