Repository: ignite Updated Branches: refs/heads/ignite-1093-2 c76cd7f8b -> c5eba501b
1093 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b59154f7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b59154f7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b59154f7 Branch: refs/heads/ignite-1093-2 Commit: b59154f7eae173f0a6e90d71e3a1c1e43e0b7431 Parents: c76cd7f Author: Anton Vinogradov <[email protected]> Authored: Mon Oct 26 17:01:46 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Mon Oct 26 17:01:46 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionDemander.java | 1 + .../distributed/dht/preloader/GridDhtPreloader.java | 13 +++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b59154f7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 5cbc4d3..6479542 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -107,6 +107,7 @@ public class GridDhtPartitionDemander { private volatile GridDhtPartitionsExchangeFuture lastExchangeFut; /** Demand lock. */ + @Deprecated//Backward compatibility. To be removed in future. private final ReadWriteLock demandLock; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/b59154f7/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 c3ad9f3..c781183 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 @@ -111,9 +111,6 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { private ConcurrentMap<AffinityTopologyVersion, GridDhtAssignmentFetchFuture> pendingAssignmentFetchFuts = new ConcurrentHashMap8<>(); - /** Demand lock. */ - private final ReadWriteLock demandLock = new ReentrantReadWriteLock(); - /** */ private final Queue<GridDhtLocalPartition> partitionsToEvict = new ConcurrentLinkedDeque8<>(); @@ -204,7 +201,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { }); supplier = new GridDhtPartitionSupplier(cctx); - demander = new GridDhtPartitionDemander(cctx, demandLock); + demander = new GridDhtPartitionDemander(cctx, busyLock); supplier.start(); demander.start(); @@ -397,13 +394,13 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { /** {@inheritDoc} */ public void handleSupplyMessage(int idx, UUID id, final GridDhtPartitionSupplyMessageV2 s) { - demandLock.readLock().lock(); + busyLock.readLock().lock(); try { demander.handleSupplyMessage(idx, id, s); } finally { - demandLock.readLock().unlock(); + busyLock.readLock().unlock(); } } @@ -720,13 +717,13 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter { /** {@inheritDoc} */ @Override public void unwindUndeploys() { - demandLock.writeLock().lock(); + busyLock.writeLock().lock(); try { cctx.deploy().unwind(cctx); } finally { - demandLock.writeLock().unlock(); + busyLock.writeLock().unlock(); } }
