Repository: ignite Updated Branches: refs/heads/master 12474bf8c -> 49fe8cd77
IGNITE-8530 fixed onNodeLeft for InitNewCoordinatorFuture - Fixes #4086. 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/49fe8cd7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49fe8cd7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49fe8cd7 Branch: refs/heads/master Commit: 49fe8cd779272b831d57597c17f391d2eb0a9794 Parents: 12474bf Author: Anton Kalashnikov <[email protected]> Authored: Thu May 31 16:06:52 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu May 31 16:06:52 2018 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/InitNewCoordinatorFuture.java | 3 +++ .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/49fe8cd7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java index 42a9ba6..5909a05 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/InitNewCoordinatorFuture.java @@ -338,6 +338,9 @@ public class InitNewCoordinatorFuture extends GridCompoundFuture { synchronized (this) { done = awaited.remove(nodeId) && awaited.isEmpty(); + + if (done) + onAllReceived(); } if (done) http://git-wip-us.apache.org/repos/asf/ignite/blob/49fe8cd7/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 6b2293a..35e9452 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 @@ -4212,10 +4212,10 @@ class ServerImpl extends TcpDiscoveryImpl { DiscoveryDataPacket dataPacket = msg.gridDiscoveryData(); - dataPacket.joiningNodeClient(msg.client()); - assert dataPacket != null : msg; + dataPacket.joiningNodeClient(msg.client()); + if (dataPacket.hasJoiningNodeData()) spi.onExchange(dataPacket, U.resolveClassLoader(spi.ignite().configuration()));
