Repository: ignite Updated Branches: refs/heads/ignite-5578 f4dde1eb7 -> 8beacecfd
ignite-5578 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8beacecf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8beacecf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8beacecf Branch: refs/heads/ignite-5578 Commit: 8beacecfd59f2447a306a29ce860d07e350138c8 Parents: f4dde1e Author: sboikov <[email protected]> Authored: Thu Aug 3 12:19:16 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Aug 3 12:19:16 2017 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPreloader.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8beacecf/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 11d9c77..46a0a44 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 @@ -611,8 +611,15 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { } } finally { - if (!partsToEvict.isEmpty()) - locked = true; + if (!partsToEvict.isEmpty()) { + if (ctx.kernalContext().isStopping()) { + partsToEvict.clear(); + + locked = false; + } + else + locked = true; + } else { boolean res = partsEvictOwning.compareAndSet(1, 0);
