Repository: ignite Updated Branches: refs/heads/ignite-zk-join [created] 2fc690e64
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ec75bba5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ec75bba5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ec75bba5 Branch: refs/heads/ignite-zk-join Commit: ec75bba550e3c6e3e51549583c7685a636ebc4d9 Parents: 07eba10 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jan 11 15:18:14 2018 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jan 11 15:18:14 2018 +0300 ---------------------------------------------------------------------- .../GridDhtPartitionsExchangeFuture.java | 26 +++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ec75bba5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index a8b195d..5744aac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -1379,12 +1379,16 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte } catch (ClusterTopologyCheckedException ignore) { if (log.isDebugEnabled()) - log.debug("Oldest node left during partition exchange [nodeId=" + oldestNode.id() + + log.debug("Coordinator left during partition exchange [nodeId=" + oldestNode.id() + ", exchId=" + exchId + ']'); } catch (IgniteCheckedException e) { - U.error(log, "Failed to send local partitions to oldest node (will retry after timeout) [oldestNodeId=" + - oldestNode.id() + ", exchId=" + exchId + ']', e); + if (reconnectOnError(e)) + onDone(new IgniteNeedReconnectException(cctx.localNode(), e)); + else { + U.error(log, "Failed to send local partitions to coordinator [crd=" + oldestNode.id() + + ", exchId=" + exchId + ']', e); + } } } @@ -3129,9 +3133,13 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte } if (allReceived) { - awaitSingleMapUpdates(); + cctx.kernalContext().getSystemExecutorService().submit(new Runnable() { + @Override public void run() { + awaitSingleMapUpdates(); - onAllReceived(null); + onAllReceived(null); + } + }); } } else { @@ -3159,7 +3167,13 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte ", newCrd=" + crd0.id() + ']'); } - sendPartitions(crd0); + final ClusterNode newCrd = crd0; + + cctx.kernalContext().getSystemExecutorService().submit(new Runnable() { + @Override public void run() { + sendPartitions(newCrd); + } + }); } } }
