Repository: ignite Updated Branches: refs/heads/ignite-5075 98a706f09 -> 11d2f715a
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11d2f715 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11d2f715 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11d2f715 Branch: refs/heads/ignite-5075 Commit: 11d2f715a3aa408d04cb17222a331e78dc02af3b Parents: 98a706f Author: sboikov <[email protected]> Authored: Wed May 17 16:40:58 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed May 17 16:40:58 2017 +0300 ---------------------------------------------------------------------- .../cache/GridCacheAffinityManager.java | 17 ----------- .../GridCachePartitionExchangeManager.java | 32 +++++++++----------- .../processors/cache/GridCacheProcessor.java | 6 ++-- .../testframework/junits/GridAbstractTest.java | 4 +-- 4 files changed, 20 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/11d2f715/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 af29812..59071b9 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 @@ -400,23 +400,6 @@ public class GridCacheAffinityManager extends GridCacheManagerAdapter { } /** - * Dumps debug information. - */ - public void dumpDebugInfo() { - GridAffinityAssignmentCache aff0 = aff; - - if (aff0 != null) - aff0.dumpDebugInfo(); - } - - /** - * @return Affinity cache. - */ - public GridAffinityAssignmentCache affinityCache() { - return aff; - } - - /** * @param part Partition. * @param startVer Start version. * @param endVer End version. http://git-wip-us.apache.org/repos/asf/ignite/blob/11d2f715/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index bff2567..c651a65 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -424,14 +424,14 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana try { fut.get(); - for (GridCacheContext cacheCtx : cctx.cacheContexts()) - cacheCtx.preloader().onInitialExchangeComplete(null); + for (CacheGroupInfrastructure grp : cctx.cache().cacheGroups()) + grp.preloader().onInitialExchangeComplete(null); reconnectExchangeFut.onDone(); } catch (IgniteCheckedException e) { - for (GridCacheContext cacheCtx : cctx.cacheContexts()) - cacheCtx.preloader().onInitialExchangeComplete(e); + for (CacheGroupInfrastructure grp : cctx.cache().cacheGroups()) + grp.preloader().onInitialExchangeComplete(e); reconnectExchangeFut.onDone(e); } @@ -476,9 +476,9 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana AffinityTopologyVersion nodeStartVer = new AffinityTopologyVersion(discoEvt.topologyVersion(), 0); - for (GridCacheContext cacheCtx : cctx.cacheContexts()) { - if (nodeStartVer.equals(cacheCtx.startTopologyVersion())) - cacheCtx.preloader().onInitialExchangeComplete(null); + for (CacheGroupInfrastructure grp : cctx.cache().cacheGroups()) { + if (nodeStartVer.equals(grp.localStartVersion())) + grp.preloader().onInitialExchangeComplete(null); } if (log.isDebugEnabled()) @@ -1395,8 +1395,8 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana dumpPendingObjects(exchTopVer); - for (GridCacheContext cacheCtx : cctx.cacheContexts()) - cacheCtx.preloader().dumpDebugInfo(); + for (CacheGroupInfrastructure grp : cctx.cache().cacheGroups()) + grp.preloader().dumpDebugInfo(); cctx.affinity().dumpDebugInfo(); @@ -1559,21 +1559,19 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana } } - for (GridCacheContext ctx : cctx.cacheContexts()) { - if (ctx.isLocal()) + for (CacheGroupInfrastructure grp : cctx.cache().cacheGroups()) { + if (grp.isLocal()) continue; - GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() : ctx; - - GridCachePreloader preloader = ctx0.preloader(); + GridCachePreloader preloader = grp.preloader(); if (preloader != null) preloader.dumpDebugInfo(); - GridCacheAffinityManager affMgr = ctx0.affinity(); + GridAffinityAssignmentCache aff = grp.affinity(); - if (affMgr != null) - affMgr.dumpDebugInfo(); + if (aff != null) + aff.dumpDebugInfo(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/11d2f715/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 ef9a2cc..494aded 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 @@ -3776,12 +3776,12 @@ public class GridCacheProcessor extends GridProcessorAdapter { ctx.closure().runLocalSafe(new Runnable() { @Override public void run() { try { - for (GridCacheContext cacheCtx : sharedCtx.cacheContexts()) { - if (!cacheCtx.isLocal() && cacheCtx.affinityNode()) { + for (CacheGroupInfrastructure grp : sharedCtx.cache().cacheGroups()) { + if (!grp.isLocal() && grp.affinityNode()) { GridDhtPartitionTopology top = null; try { - top = cacheCtx.topology(); + top = grp.topology(); } catch (IllegalStateException ignore) { // Cache stopped. http://git-wip-us.apache.org/repos/asf/ignite/blob/11d2f715/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index e37e051..d4f2a09 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -2075,11 +2075,11 @@ public abstract class GridAbstractTest extends TestCase { */ protected final int groupIdForCache(Ignite node, String cacheName) { for (CacheGroupInfrastructure grp : ((IgniteKernal)node).context().cache().cacheGroups()) { - if (cacheName.equals(grp.name())) + if (!grp.sharedGroup() && cacheName.equals(grp.cacheOrGroupName())) return grp.groupId(); } - fail("Failed to find group fro cache: " + cacheName); + fail("Failed to find group for cache: " + cacheName); return 0; }
