Merge branch 'ignite-5578-locJoin' into ignite-5578 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java # modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3db3266c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3db3266c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3db3266c Branch: refs/heads/ignite-5578 Commit: 3db3266c2290948da2cfda302a844cf64727b356 Parents: 5978213 Author: sboikov <[email protected]> Authored: Wed Jul 19 13:13:21 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Jul 19 13:13:21 2017 +0300 ---------------------------------------------------------------------- .../cache/CacheAffinitySharedManager.java | 46 +------------------- .../preloader/CacheGroupAffinityMessage.java | 2 +- 2 files changed, 2 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3db3266c/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 1fc59bb..7f55e79 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 @@ -1289,7 +1289,7 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap }); } - public void onJoin(final GridDhtPartitionsExchangeFuture fut, GridDhtPartitionsFullMessage msg) + public void onLocalJoin(final GridDhtPartitionsExchangeFuture fut, GridDhtPartitionsFullMessage msg) throws IgniteCheckedException { final Set<Integer> affReq = fut.context().groupsAffinityRequestOnJoin(); @@ -1370,50 +1370,6 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap } /** - * @param fut Exchange future. - * @param msg Message. - */ - public void onLocalJoin(final GridDhtPartitionsExchangeFuture fut, GridDhtPartitionsFullMessage msg) { - final Set<Integer> affReq = fut.context().groupsAffinityRequestOnJoin(); - - if (F.isEmpty(affReq)) - return; - - final Map<Long, ClusterNode> nodesByOrder = new HashMap<>(); - - final Map<Integer, CacheGroupAffinityMessage> joinedNodeAff = msg.joinedNodeAffinity(); - - assert !F.isEmpty(joinedNodeAff) : msg; - assert joinedNodeAff.size() >= affReq.size(); - - forAllCacheGroups(false, new IgniteInClosureX<GridAffinityAssignmentCache>() { - @Override public void applyx(GridAffinityAssignmentCache aff) throws IgniteCheckedException { - if (affReq.contains(aff.groupId())) { - assert AffinityTopologyVersion.NONE.equals(aff.lastVersion()); - - CacheGroupAffinityMessage affMsg = joinedNodeAff.get(aff.groupId()); - - assert affMsg != null; - - List<List<ClusterNode>> assignments = affMsg.createAssignments(nodesByOrder, fut.discoCache()); - - // Calculate ideal assignments. - if (!aff.centralizedAffinityFunction()) - aff.calculate(fut.topologyVersion(), fut.discoveryEvent(), fut.discoCache()); - - aff.initialize(fut.topologyVersion(), assignments); - - CacheGroupContext grp = cctx.cache().cacheGroup(aff.groupId()); - - assert grp != null; - - grp.topology().initPartitions(fut); - } - } - }); - } - - /** * Called on exchange initiated by server node join. * * @param fut Exchange future. http://git-wip-us.apache.org/repos/asf/ignite/blob/3db3266c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java index b310308..fcfec1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/CacheGroupAffinityMessage.java @@ -250,7 +250,7 @@ public class CacheGroupAffinityMessage implements Message { /** {@inheritDoc} */ @Override public byte fieldsCount() { - return 1; + return 2; } /** {@inheritDoc} */
