[01/50] [abbrv] ignite git commit: IGNITE-10374 Fixed race leading to rebalancing hang when WAL is disabled during rebalancing - Fixes #5468.
Repository: ignite
Updated Branches:
refs/heads/ignite-10044 216474c6b -> 89ec0339d
IGNITE-10374 Fixed race leading to rebalancing hang when WAL is disabled during
rebalancing - Fixes #5468.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/493e0aa9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/493e0aa9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/493e0aa9
Branch: refs/heads/ignite-10044
Commit: 493e0aa9e8451d36ff504560cc5309e8cd04a616
Parents: d36055e
Author: Sergey Chugunov
Authored: Sat Dec 1 19:33:14 2018 +0300
Committer: Alexey Goncharuk
Committed: Sat Dec 1 19:34:39 2018 +0300
--
.../processors/cache/WalStateManager.java | 4 +-
.../GridDhtPartitionsExchangeFuture.java| 3 +-
.../dht/preloader/GridDhtPreloader.java | 35 +--
.../topology/GridClientPartitionTopology.java | 2 +-
.../dht/topology/GridDhtPartitionTopology.java | 4 +-
.../topology/GridDhtPartitionTopologyImpl.java | 17 +-
.../cache/persistence/CheckpointFuture.java | 2 +-
.../GridCacheDatabaseSharedManager.java | 2 +-
...itePdsCacheWalDisabledOnRebalancingTest.java | 266 +++
.../ignite/testsuites/IgnitePdsTestSuite4.java | 3 +
10 files changed, 293 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/493e0aa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
index d17f20f..ed62cad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
@@ -473,7 +473,7 @@ public class WalStateManager extends
GridCacheSharedManagerAdapter {
public void onGroupRebalanceFinished(int grpId, AffinityTopologyVersion
topVer) {
TemporaryDisabledWal session0 = tmpDisabledWal;
-if (session0 == null || !session0.topVer.equals(topVer))
+if (session0 == null || session0.topVer.compareTo(topVer) > 0)
return;
session0.remainingGrps.remove(grpId);
@@ -506,7 +506,7 @@ public class WalStateManager extends
GridCacheSharedManagerAdapter {
assert grp != null;
-grp.topology().ownMoving(session0.topVer);
+grp.topology().ownMoving(topVer);
}
cctx.exchange().refreshPartitions();
http://git-wip-us.apache.org/repos/asf/ignite/blob/493e0aa9/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 3384bb9..1eba8b4 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
@@ -2101,7 +2101,8 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
grp.topology().onExchangeDone(this,
grp.affinity().readyAffinity(res), false);
}
-cctx.walState().changeLocalStatesOnExchangeDone(res);
+if (changedAffinity())
+cctx.walState().changeLocalStatesOnExchangeDone(res);
}
final Throwable err0 = err;
http://git-wip-us.apache.org/repos/asf/ignite/blob/493e0aa9/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 eed0816..c8705d0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++
ignite git commit: IGNITE-10374 Fixed race leading to rebalancing hang when WAL is disabled during rebalancing - Fixes #5468.
Repository: ignite
Updated Branches:
refs/heads/master d36055ec1 -> 493e0aa9e
IGNITE-10374 Fixed race leading to rebalancing hang when WAL is disabled during
rebalancing - Fixes #5468.
Signed-off-by: Alexey Goncharuk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/493e0aa9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/493e0aa9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/493e0aa9
Branch: refs/heads/master
Commit: 493e0aa9e8451d36ff504560cc5309e8cd04a616
Parents: d36055e
Author: Sergey Chugunov
Authored: Sat Dec 1 19:33:14 2018 +0300
Committer: Alexey Goncharuk
Committed: Sat Dec 1 19:34:39 2018 +0300
--
.../processors/cache/WalStateManager.java | 4 +-
.../GridDhtPartitionsExchangeFuture.java| 3 +-
.../dht/preloader/GridDhtPreloader.java | 35 +--
.../topology/GridClientPartitionTopology.java | 2 +-
.../dht/topology/GridDhtPartitionTopology.java | 4 +-
.../topology/GridDhtPartitionTopologyImpl.java | 17 +-
.../cache/persistence/CheckpointFuture.java | 2 +-
.../GridCacheDatabaseSharedManager.java | 2 +-
...itePdsCacheWalDisabledOnRebalancingTest.java | 266 +++
.../ignite/testsuites/IgnitePdsTestSuite4.java | 3 +
10 files changed, 293 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/493e0aa9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
index d17f20f..ed62cad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java
@@ -473,7 +473,7 @@ public class WalStateManager extends
GridCacheSharedManagerAdapter {
public void onGroupRebalanceFinished(int grpId, AffinityTopologyVersion
topVer) {
TemporaryDisabledWal session0 = tmpDisabledWal;
-if (session0 == null || !session0.topVer.equals(topVer))
+if (session0 == null || session0.topVer.compareTo(topVer) > 0)
return;
session0.remainingGrps.remove(grpId);
@@ -506,7 +506,7 @@ public class WalStateManager extends
GridCacheSharedManagerAdapter {
assert grp != null;
-grp.topology().ownMoving(session0.topVer);
+grp.topology().ownMoving(topVer);
}
cctx.exchange().refreshPartitions();
http://git-wip-us.apache.org/repos/asf/ignite/blob/493e0aa9/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 3384bb9..1eba8b4 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
@@ -2101,7 +2101,8 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
grp.topology().onExchangeDone(this,
grp.affinity().readyAffinity(res), false);
}
-cctx.walState().changeLocalStatesOnExchangeDone(res);
+if (changedAffinity())
+cctx.walState().changeLocalStatesOnExchangeDone(res);
}
final Throwable err0 = err;
http://git-wip-us.apache.org/repos/asf/ignite/blob/493e0aa9/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 eed0816..c8705d0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++
