Repository: ignite Updated Branches: refs/heads/ignite-1741 d05b38210 -> 08a125c4f
ignite-1741 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/08a125c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/08a125c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/08a125c4 Branch: refs/heads/ignite-1741 Commit: 08a125c4f9ed19392ffd513bc4a119221fffa991 Parents: d05b382 Author: sboikov <[email protected]> Authored: Wed Dec 19 23:16:25 2018 +0300 Committer: sboikov <[email protected]> Committed: Wed Dec 19 23:16:25 2018 +0300 ---------------------------------------------------------------------- .../internal/managers/discovery/DiscoCache.java | 8 -------- .../discovery/GridDiscoveryManager.java | 20 +------------------- .../affinity/GridAffinityProcessor.java | 16 ++++------------ 3 files changed, 5 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/08a125c4/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java index 2d6eeb0..e99e478 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java @@ -328,14 +328,6 @@ public class DiscoCache { } /** - * @param cacheName Cache name. - * @return {@code True} if cache with given name exists. - */ - public boolean cacheStarted(String cacheName) { - return allCacheNodes.containsKey(CU.cacheId(cacheName)); - } - - /** * Gets all nodes that have cache with given name. * * @param cacheName Cache name. http://git-wip-us.apache.org/repos/asf/ignite/blob/08a125c4/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index ba8861e..f5b3ba7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -1921,7 +1921,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @param topVer Topology version. * @return Collection of cache nodes. */ - public Collection<ClusterNode> cacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) { + public List<ClusterNode> cacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) { return resolveDiscoCache(CU.cacheId(cacheName), topVer).cacheNodes(cacheName); } @@ -3420,24 +3420,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { } } } - - if (cacheGrpAffNodes.size() != registeredCacheGrps.size()) { - for (Map.Entry<Integer, CacheGroupAffinity> e : registeredCacheGrps.entrySet()) { - Integer grpId = e.getKey(); - - if (!cacheGrpAffNodes.containsKey(grpId)) - cacheGrpAffNodes.put(grpId, Collections.emptyList()); - } - } - - if (allCacheNodes.size() != registeredCaches.size()) { - for (Map.Entry<String, CachePredicate> entry : registeredCaches.entrySet()) { - Integer cacheId = CU.cacheId(entry.getKey()); - - if (!allCacheNodes.containsKey(cacheId)) - allCacheNodes.put(cacheId, Collections.emptyList()); - } - } } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/08a125c4/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java index a290d83..40f9d5b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessor.java @@ -44,7 +44,6 @@ import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; -import org.apache.ignite.internal.managers.discovery.DiscoCache; import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener; import org.apache.ignite.internal.processors.GridProcessorAdapter; import org.apache.ignite.internal.processors.cache.CacheObject; @@ -383,6 +382,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { return affInfo != null ? affinityMap(affInfo, keys) : Collections.<ClusterNode, Collection<K>>emptyMap(); } + /** * @param cacheName Cache name. * @param topVer Topology version. @@ -424,7 +424,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { cctx.gate().enter(); } catch (IllegalStateException ignored) { - return new GridFinishedFuture<>(null); + return new GridFinishedFuture<>((AffinityInfo)null); } try { @@ -452,15 +452,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { } } - DiscoCache discoCache = ctx.discovery().discoCache(topVer); - - if (discoCache == null) - return new GridFinishedFuture<>(new IgniteCheckedException("Failed to resolve cluster topology: " + topVer)); - - if (!discoCache.cacheStarted(cacheName)) - return new GridFinishedFuture<>(null); - - List<ClusterNode> cacheNodes = discoCache.cacheNodes(cacheName); + List<ClusterNode> cacheNodes = ctx.discovery().cacheNodes(cacheName, topVer); DynamicCacheDescriptor desc = ctx.cache().cacheDescriptor(cacheName); @@ -469,7 +461,7 @@ public class GridAffinityProcessor extends GridProcessorAdapter { return new GridFinishedFuture<>(new IgniteClientDisconnectedCheckedException(ctx.cluster().clientReconnectFuture(), "Failed to get affinity mapping, client disconnected.")); - return new GridFinishedFuture<>(null); + return new GridFinishedFuture<>((AffinityInfo)null); } if (desc.cacheConfiguration().getCacheMode() == LOCAL)
