From 14d3e94315b6ac2ed598e381416837eddc764bc5 Mon Sep 17 00:00:00 2001 From: agura Date: Tue, 7 Apr 2015 02:03:50 +0300 Subject: [PATCH] ignite-688 Age related cluster group doesn't refresh dynamically --- .../internal/cluster/ClusterGroupAdapter.java | 29 ++++------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java index 0daffcc..40462c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterGroupAdapter.java @@ -114,28 +114,6 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { } /** - * @param subjId Subject ID. - * @param ctx Grid kernal context. - * @param p Predicate. - * @param ids Node IDs. - */ - private ClusterGroupAdapter(@Nullable GridKernalContext ctx, - @Nullable UUID subjId, - @Nullable IgnitePredicate p, - Set ids) - { - if (ctx != null) - setKernalContext(ctx); - - this.subjId = subjId; - this.p = p; - this.ids = ids; - - if (p == null && ids != null) - this.p = F.nodeForNodeIds(ids); - } - - /** * ctx.gateway().readLock() */ protected void guard() { @@ -806,7 +784,7 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { * @param isOldest Oldest flag. */ private AgeClusterGroup(ClusterGroupAdapter parent, boolean isOldest) { - super(parent.ctx, parent.subjId, (IgnitePredicate) null); + super(parent.ctx, parent.subjId, (IgnitePredicate)null); this.isOldest = isOldest; @@ -822,7 +800,10 @@ public class ClusterGroupAdapter implements ClusterGroupEx, Externalizable { try { lastTopVer = ctx.discovery().topologyVersion(); - this.node = isOldest ? U.oldest(super.nodes(), null) : U.youngest(super.nodes(), null); + Collection nodes = ctx.discovery().allNodes(); + + this.node = isOldest ? U.oldest(nodes, null) : U.youngest(nodes, null); + this.p = F.nodeForNodes(node); } finally { -- 1.9.5.msysgit.1