IGNITE-6480 fix serverTopologyNodes method - Fixes #2726. Signed-off-by: Alexey Goncharuk <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ccdc978 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ccdc978 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ccdc978 Branch: refs/heads/ignite-gg-12822 Commit: 1ccdc97898b37c7f2240cb222c98899603536fc0 Parents: 24f904e Author: Dmitriy Govorukhin <[email protected]> Authored: Fri Sep 22 13:14:57 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Sep 22 13:24:34 2017 +0300 ---------------------------------------------------------------------- .../internal/managers/discovery/GridDiscoveryManager.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1ccdc978/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 18815ac..5ce7816 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 @@ -183,7 +183,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { private static final int DISCOVERY_HISTORY_SIZE = getInteger(IGNITE_DISCOVERY_HISTORY_SIZE, 500); /** Predicate filtering out daemon nodes. */ - private static final IgnitePredicate<ClusterNode> FILTER_DAEMON = new P1<ClusterNode>() { + private static final IgnitePredicate<ClusterNode> FILTER_NOT_DAEMON = new P1<ClusterNode>() { @Override public boolean apply(ClusterNode n) { return !n.isDaemon(); } @@ -738,7 +738,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { discoEvt.eventNode(node); discoEvt.type(EVT_NODE_JOINED); - discoEvt.topologySnapshot(topVer, new ArrayList<>(F.view(topSnapshot, FILTER_DAEMON))); + discoEvt.topologySnapshot(topVer, new ArrayList<>(F.view(topSnapshot, FILTER_NOT_DAEMON))); discoWrk.discoCache = discoCache; @@ -2059,7 +2059,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @return Server topology nodes or {@code null} if there are no nodes for passed in version. */ @Nullable public Collection<ClusterNode> serverTopologyNodes(long topVer) { - return F.view(topology(topVer), F.not(FILTER_CLI)); + return F.view(topology(topVer), F.not(FILTER_CLI), FILTER_NOT_DAEMON); } /** @return All daemon nodes in topology. */ @@ -2522,7 +2522,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { evt.node(ctx.discovery().localNode()); evt.eventNode(node); evt.type(type); - evt.topologySnapshot(topVer, U.<ClusterNode, ClusterNode>arrayList(topSnapshot, FILTER_DAEMON)); + evt.topologySnapshot(topVer, U.<ClusterNode, ClusterNode>arrayList(topSnapshot, FILTER_NOT_DAEMON)); if (type == EVT_NODE_METRICS_UPDATED) evt.message("Metrics were updated: " + node);
