You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/11 07:14:27 UTC
[1/2] ignite git commit: ignite-1758 Discovery fixes.
Repository: ignite
Updated Branches:
refs/heads/ignite-1758-debug a735872f4 -> 45af5a939
ignite-1758 Discovery fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/839fa04f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/839fa04f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/839fa04f
Branch: refs/heads/ignite-1758-debug
Commit: 839fa04f9f8cce8f0c36eb72d613aee0c342b784
Parents: f9b1df0
Author: sboikov <sb...@gridgain.com>
Authored: Wed Nov 11 09:13:50 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Nov 11 09:13:50 2015 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/tcp/ServerImpl.java | 34 ++++++++++++--------
1 file changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/839fa04f/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 0233435..9ff0545 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
@@ -1082,19 +1082,32 @@ class ServerImpl extends TcpDiscoveryImpl {
TcpDiscoveryHandshakeRequest req = new TcpDiscoveryHandshakeRequest(locNodeId);
- if (msg instanceof TcpDiscoveryJoinRequestMessage) {
- synchronized (failedNodes) {
- for (TcpDiscoveryNode node : failedNodes)
- req.addFailedNode(node);
- }
- }
-
// Handshake.
spi.writeToSocket(sock, req, timeoutHelper.nextTimeoutChunk(spi.getSocketTimeout()));
TcpDiscoveryHandshakeResponse res = spi.readMessage(sock, null, timeoutHelper.nextTimeoutChunk(
ackTimeout0));
+ if (msg instanceof TcpDiscoveryJoinRequestMessage) {
+ boolean ignore = false;
+
+ synchronized (failedNodes) {
+ for (TcpDiscoveryNode failedNode : failedNodes) {
+ if (failedNode.id().equals(res.creatorNodeId())) {
+ if (log.isDebugEnabled())
+ log.debug("Ignore response from node from failed list: " + res);
+
+ ignore = true;
+
+ break;
+ }
+ }
+ }
+
+ if (ignore)
+ break;
+ }
+
if (locNodeId.equals(res.creatorNodeId())) {
if (log.isDebugEnabled())
log.debug("Handshake response from local node: " + res);
@@ -4861,13 +4874,6 @@ class ServerImpl extends TcpDiscoveryImpl {
// Handshake.
TcpDiscoveryHandshakeRequest req = (TcpDiscoveryHandshakeRequest)msg;
- if (req.failedNodes() != null && req.failedNodes().contains(getLocalNodeId())) {
- if (log.isDebugEnabled())
- log.debug("Ignore handshake request, local node is in failed list: " + req);
-
- return;
- }
-
UUID nodeId = req.creatorNodeId();
this.nodeId = nodeId;
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1758-debug' into ignite-1758-debug
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-1758-debug' into ignite-1758-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45af5a93
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45af5a93
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45af5a93
Branch: refs/heads/ignite-1758-debug
Commit: 45af5a939d9cd7caf36728975fdc1044d82e2164
Parents: 839fa04 a735872
Author: sboikov <sb...@gridgain.com>
Authored: Wed Nov 11 09:14:19 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Nov 11 09:14:19 2015 +0300
----------------------------------------------------------------------
.../testframework/junits/GridAbstractTest.java | 30 ++++++++++++++------
1 file changed, 22 insertions(+), 8 deletions(-)
----------------------------------------------------------------------