ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: ignite-1171
Date Fri, 18 Sep 2015 08:11:51 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1171 baa1a6bee -> 98083b715


ignite-1171


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

Branch: refs/heads/ignite-1171
Commit: 98083b7158408aace3cff4d4a3c3b10d7071fce3
Parents: baa1a6b
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Sep 18 11:11:45 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Sep 18 11:11:45 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java   | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/98083b71/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index a8e2db7..18db05a 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -1945,7 +1945,7 @@ class ServerImpl extends TcpDiscoveryImpl {
         /** Pending custom messages that should not be sent between NodeAdded and NodeAddFinished
messages. */
         private Queue<TcpDiscoveryCustomEventMessage> pendingCustomMsgs = new LinkedList<>();
 
-        /** Collection to track when a new node starts join process. */
+        /** Collection to track joining nodes. */
         private Set<UUID> joiningNodes = new HashSet<>();
 
         /**
@@ -3555,6 +3555,8 @@ class ServerImpl extends TcpDiscoveryImpl {
                     }
                 }
 
+                joiningNodes.remove(leftNode.id());
+
                 spi.stats.onNodeLeft();
 
                 notifyDiscovery(EVT_NODE_LEFT, topVer, leftNode);
@@ -3582,6 +3584,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                 U.closeQuiet(sock);
             }
+
+            checkPendingCustomMessages();
         }
 
         /**
@@ -3709,6 +3713,8 @@ class ServerImpl extends TcpDiscoveryImpl {
                         ", msg=" + msg.warning() + ']');
                 }
 
+                joiningNodes.remove(node.id());
+
                 notifyDiscovery(EVT_NODE_FAILED, topVer, node);
 
                 spi.stats.onNodeFailed();
@@ -3722,6 +3728,8 @@ class ServerImpl extends TcpDiscoveryImpl {
 
                 U.closeQuiet(sock);
             }
+
+            checkPendingCustomMessages();
         }
 
         /**


Mime
View raw message