IGNITE-9755 fix PutAllSyncFailover hangs + mute test - Fixes #4735. Signed-off-by: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9b65d6e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9b65d6e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9b65d6e Branch: refs/heads/ignite-9720 Commit: a9b65d6e4a86e00876fdbfc17a13ceed718c21e7 Parents: e29a8cb Author: Alexey Stelmak <spiderru5...@gmail.com> Authored: Wed Oct 24 00:52:28 2018 +0300 Committer: Dmitriy Govorukhin <dmitriy.govoruk...@gmail.com> Committed: Wed Oct 24 00:52:28 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCachePartitionExchangeManager.java | 5 +++++ .../distributed/CacheAsyncOperationsFailoverAbstractTest.java | 2 ++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a9b65d6e/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 b0e0d0d..38d5725 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 @@ -781,6 +781,11 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana for (AffinityReadyFuture f : readyFuts.values()) f.onDone(stopErr); + GridDhtPartitionsExchangeFuture lastFut = lastInitializedFut; + + if (lastFut != null) + lastFut.onDone(stopErr); + if (!cctx.kernalContext().clientNode()) { for (int cnt = 0; cnt < cctx.gridConfig().getRebalanceThreadPoolSize(); cnt++) cctx.io().removeOrderedHandler(true, rebalanceTopic(cnt)); http://git-wip-us.apache.org/repos/asf/ignite/blob/a9b65d6e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java index f1377df..211320f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsFailoverAbstractTest.java @@ -111,6 +111,8 @@ public abstract class CacheAsyncOperationsFailoverAbstractTest extends GridCache * @throws Exception If failed. */ public void testAsyncFailover() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-9759";); + IgniteCache<TestKey, TestValue> cache = ignite(0).cache(DEFAULT_CACHE_NAME); int ops = cache.getConfiguration(CacheConfiguration.class).getMaxConcurrentAsyncOperations();
