[34/50] [abbrv] ignite git commit: IGNITE-7165 Re-balancing is cancelled if client node joins

2018-08-03 Thread av 
IGNITE-7165 Re-balancing is cancelled if client node joins

Signed-off-by: Anton Vinogradov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/137dd06a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/137dd06a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/137dd06a

Branch: refs/heads/ignite-8446
Commit: 137dd06aaee9cc84104e6b4bf48306b050341e3a
Parents: f6f731f
Author: Maxim Muzafarov 
Authored: Wed Aug 1 18:39:54 2018 +0300
Committer: Anton Vinogradov 
Committed: Wed Aug 1 18:39:54 2018 +0300

--
 .../GridCachePartitionExchangeManager.java  |  68 ++---
 .../processors/cache/GridCachePreloader.java|  21 ++-
 .../cache/GridCachePreloaderAdapter.java|   6 +
 .../dht/preloader/GridDhtPartitionDemander.java |  55 ---
 .../dht/preloader/GridDhtPartitionSupplier.java |  26 ++--
 .../dht/preloader/GridDhtPreloader.java |  60 +++-
 .../preloader/GridDhtPreloaderAssignments.java  |   6 +-
 .../ClusterBaselineNodesMetricsSelfTest.java|   1 -
 .../cache/CacheValidatorMetricsTest.java|   4 +-
 .../dht/GridCacheDhtPreloadSelfTest.java|  68 +
 .../atomic/IgniteCacheAtomicProtocolTest.java   |   3 -
 .../GridCacheRebalancingAsyncSelfTest.java  |   7 +-
 .../GridCacheRebalancingCancelTest.java | 106 +
 ...idCacheRebalancingPartitionCountersTest.java |   3 +-
 .../GridCacheRebalancingSyncSelfTest.java   | 149 +++
 ...lientAffinityAssignmentWithBaselineTest.java |   4 +-
 ...SlowHistoricalRebalanceSmallHistoryTest.java |   5 +-
 ...lFlushMultiNodeFailoverAbstractSelfTest.java |   2 +-
 .../GridMarshallerMappingConsistencyTest.java   |   3 +-
 .../junits/common/GridCommonAbstractTest.java   | 115 +++---
 .../testsuites/IgniteCacheTestSuite3.java   |   2 +
 21 files changed, 370 insertions(+), 344 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/137dd06a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 053..824aa67 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -66,7 +66,6 @@ import 
org.apache.ignite.internal.managers.discovery.DiscoveryLocalJoinData;
 import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import 
org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.ExchangeLatchManager;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridClientPartitionTopology;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
@@ -88,6 +87,7 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Ign
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.RebalanceReassignExchangeTask;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.StopCachesOnClientReconnectExchangeTask;
+import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.ExchangeLatchManager;
 import 
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteCacheSnapshotManager;
 import 
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotDiscoveryMessage;
 import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
@@ -179,6 +179,14 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 private final ConcurrentMap 
readyFuts =
 new ConcurrentSkipListMap<>();
 
+/**
+ * Latest started rebalance topology version but possibly not finished 
yet. Value {@code NONE}
+ * means that previous rebalance is undefined and the new one should be 
initiated.
+ *
+ * Should not be used to determine latest rebalanced topology.
+ */
+private volatile AffinityTopologyVersion rebTopVer = 
AffinityTopologyVersion.NONE;
+
 /** */
 private GridFutureAdapter reconnectExch

ignite git commit: IGNITE-7165 Re-balancing is cancelled if client node joins

2018-08-01 Thread av 
Repository: ignite
Updated Branches:
  refs/heads/master f6f731f57 -> 137dd06aa


IGNITE-7165 Re-balancing is cancelled if client node joins

Signed-off-by: Anton Vinogradov 


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/137dd06a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/137dd06a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/137dd06a

Branch: refs/heads/master
Commit: 137dd06aaee9cc84104e6b4bf48306b050341e3a
Parents: f6f731f
Author: Maxim Muzafarov 
Authored: Wed Aug 1 18:39:54 2018 +0300
Committer: Anton Vinogradov 
Committed: Wed Aug 1 18:39:54 2018 +0300

--
 .../GridCachePartitionExchangeManager.java  |  68 ++---
 .../processors/cache/GridCachePreloader.java|  21 ++-
 .../cache/GridCachePreloaderAdapter.java|   6 +
 .../dht/preloader/GridDhtPartitionDemander.java |  55 ---
 .../dht/preloader/GridDhtPartitionSupplier.java |  26 ++--
 .../dht/preloader/GridDhtPreloader.java |  60 +++-
 .../preloader/GridDhtPreloaderAssignments.java  |   6 +-
 .../ClusterBaselineNodesMetricsSelfTest.java|   1 -
 .../cache/CacheValidatorMetricsTest.java|   4 +-
 .../dht/GridCacheDhtPreloadSelfTest.java|  68 +
 .../atomic/IgniteCacheAtomicProtocolTest.java   |   3 -
 .../GridCacheRebalancingAsyncSelfTest.java  |   7 +-
 .../GridCacheRebalancingCancelTest.java | 106 +
 ...idCacheRebalancingPartitionCountersTest.java |   3 +-
 .../GridCacheRebalancingSyncSelfTest.java   | 149 +++
 ...lientAffinityAssignmentWithBaselineTest.java |   4 +-
 ...SlowHistoricalRebalanceSmallHistoryTest.java |   5 +-
 ...lFlushMultiNodeFailoverAbstractSelfTest.java |   2 +-
 .../GridMarshallerMappingConsistencyTest.java   |   3 +-
 .../junits/common/GridCommonAbstractTest.java   | 115 +++---
 .../testsuites/IgniteCacheTestSuite3.java   |   2 +
 21 files changed, 370 insertions(+), 344 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/137dd06a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
--
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 053..824aa67 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -66,7 +66,6 @@ import 
org.apache.ignite.internal.managers.discovery.DiscoveryLocalJoinData;
 import org.apache.ignite.internal.managers.eventstorage.DiscoveryEventListener;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import 
org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache;
-import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.ExchangeLatchManager;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridClientPartitionTopology;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtPartitionTopology;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTopologyFuture;
@@ -88,6 +87,7 @@ import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Ign
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.IgniteDhtPartitionsToReloadMap;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.RebalanceReassignExchangeTask;
 import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.StopCachesOnClientReconnectExchangeTask;
+import 
org.apache.ignite.internal.processors.cache.distributed.dht.preloader.latch.ExchangeLatchManager;
 import 
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteCacheSnapshotManager;
 import 
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotDiscoveryMessage;
 import 
org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
@@ -179,6 +179,14 @@ public class GridCachePartitionExchangeManager 
extends GridCacheSharedMana
 private final ConcurrentMap 
readyFuts =
 new ConcurrentSkipListMap<>();
 
+/**
+ * Latest started rebalance topology version but possibly not finished 
yet. Value {@code NONE}
+ * means that previous rebalance is undefined and the new one should be 
initiated.
+ *
+ * Should not be used to determine latest rebalanced topology.
+ */
+private volatile AffinityTopologyVersion rebTopVer = 
AffinityTop