ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [29/35] ignite git commit: IGNITE-6480 fix serverTopologyNodes method - Fixes #2726.
Date Fri, 22 Sep 2017 11:22:08 GMT
IGNITE-6480 fix serverTopologyNodes method - Fixes #2726.

Signed-off-by: Alexey Goncharuk <alexey.goncharuk@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/05eba9a2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/05eba9a2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/05eba9a2

Branch: refs/heads/ignite-3479
Commit: 05eba9a2e19614843157a04fe33c281be65c7d52
Parents: e3d448e
Author: Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com>
Authored: Fri Sep 22 13:14:57 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Fri Sep 22 13:14:57 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/05eba9a2/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 33350de..527399d 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
@@ -181,7 +181,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();
         }
@@ -736,7 +736,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;
 
@@ -2002,7 +2002,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. */
@@ -2456,7 +2456,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);


Mime
View raw message