Repository: ignite Updated Branches: refs/heads/ignite-1537 39dd6e5e5 -> ae04c29e7
ignite-1.5 Should not wait on preloader sync future for system caches callbacks. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ae04c29e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ae04c29e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ae04c29e Branch: refs/heads/ignite-1537 Commit: ae04c29e7ba409aeb33a234bb1774fd6aadd20a9 Parents: 39dd6e5 Author: sboikov <sboi...@gridgain.com> Authored: Mon Nov 30 14:14:35 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Nov 30 14:14:35 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/preloader/GridDhtPreloader.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ae04c29e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java index a12e1e7..fcec7bd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java @@ -160,9 +160,13 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { } if (!initRebalanceFut.isDone()) { - cctx.closures().runLocalSafe(new Runnable() { - @Override public void run() { - initRebalanceFut.onDone(); + initialRebalanceFuture().listen(new CI1<IgniteInternalFuture<?>>() { + @Override public void apply(IgniteInternalFuture<?> fut) { + cctx.closures().runLocalSafe(new Runnable() { + @Override public void run() { + initRebalanceFut.onDone(); + } + }); } }); }