Repository: ignite Updated Branches: refs/heads/ignite-1758-debug b4ea667c1 -> fd8d15b4c
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fd8d15b4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fd8d15b4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fd8d15b4 Branch: refs/heads/ignite-1758-debug Commit: fd8d15b4cfbf96f11fba288f4f84cf114402fd52 Parents: b4ea667 Author: sboikov <[email protected]> Authored: Mon Nov 16 22:04:44 2015 +0300 Committer: sboikov <[email protected]> Committed: Mon Nov 16 22:04:44 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fd8d15b4/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 2f93e25..92d616a 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 @@ -2543,7 +2543,12 @@ class ServerImpl extends TcpDiscoveryImpl { assert !forceSndPending || msg instanceof TcpDiscoveryNodeLeftMessage; - if (newNextNode || failure || forceSndPending) { + boolean sndPending= + (newNextNode && ring.minimumNodeVersion().compareTo(CUSTOM_MSG_ALLOW_JOINING_FOR_VERIFIED_SINCE) >= 0) || + failure || + forceSndPending; + + if (sndPending) { if (log.isDebugEnabled()) log.debug("Pending messages will be sent [failure=" + failure + ", newNextNode=" + newNextNode + @@ -4475,7 +4480,7 @@ class ServerImpl extends TcpDiscoveryImpl { assert ring.minimumNodeVersion() != null : ring; if (ring.minimumNodeVersion().compareTo(CUSTOM_MSG_ALLOW_JOINING_FOR_VERIFIED_SINCE) >= 0) - delayMsg = !joiningNodes.isEmpty(); + delayMsg = msg.topologyVersion() == 0L && !joiningNodes.isEmpty(); else delayMsg = !joiningNodes.isEmpty();
