Repository: ignite Updated Branches: refs/heads/master 414f45e0a -> 5e5768f1d
IGNITE-9024 Wrong usage of idxLatch in DynamicIndexAbstractConcurrentSelfTest - Fixes #4376. Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5e5768f1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5e5768f1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5e5768f1 Branch: refs/heads/master Commit: 5e5768f1da0275d4e0be28ffaba87d23f220d70e Parents: 414f45e Author: Dmitriy Sorokin <[email protected]> Authored: Wed Aug 8 13:31:54 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Wed Aug 8 13:32:49 2018 +0300 ---------------------------------------------------------------------- .../DynamicIndexAbstractConcurrentSelfTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5e5768f1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java index f8bb0cf..bf98491 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java @@ -161,7 +161,7 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde IgniteInternalFuture<?> idxFut1 = queryProcessor(cli).dynamicIndexCreate(CACHE_NAME, CACHE_NAME, TBL_NAME, idx1, false, 0); - idxLatch.countDown(); + idxLatch.await(); //srv1.close(); Ignition.stop(srv1.name(), true); @@ -182,7 +182,7 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde IgniteInternalFuture<?> idxFut2 = queryProcessor(cli).dynamicIndexCreate(CACHE_NAME, CACHE_NAME, TBL_NAME, idx2, false, 0); - idxLatch.countDown(); + idxLatch.await(); //srv2.close(); Ignition.stop(srv2.name(), true); @@ -221,6 +221,8 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde IgniteInternalFuture<?> idxFut2 = queryProcessor(srv1).dynamicIndexCreate(CACHE_NAME, CACHE_NAME, TBL_NAME, idx2, false, 0); + idxLatch.await(); + // Start even more nodes of different flavors ignitionStart(serverConfiguration(5)); ignitionStart(serverConfiguration(6, true)); @@ -237,8 +239,6 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, QueryIndex.DFLT_INLINE_SIZE, field(FIELD_NAME_1)); assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_2, QueryIndex.DFLT_INLINE_SIZE, field(aliasUnescaped(FIELD_NAME_2))); - idxLatch.countDown(); - put(srv1, 0, KEY_AFTER); assertIndexUsed(IDX_NAME_1, SQL_SIMPLE_FIELD_1, SQL_ARG_1); @@ -265,6 +265,8 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde IgniteInternalFuture<?> idxFut = queryProcessor(srv1).dynamicIndexCreate(CACHE_NAME, CACHE_NAME, TBL_NAME, idx, false, 0); + idxLatch.await(); + ignitionStart(serverConfiguration(2)); ignitionStart(serverConfiguration(3, true)); ignitionStart(clientConfiguration(4)); @@ -275,8 +277,6 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde idxFut.get(); - idxLatch.countDown(); - assertIndex(CACHE_NAME, TBL_NAME, IDX_NAME_1, QueryIndex.DFLT_INLINE_SIZE, field(FIELD_NAME_1)); put(srv1, 0, KEY_AFTER); @@ -407,8 +407,8 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde final IgniteInternalFuture<?> idxFut = queryProcessor(srv1).dynamicIndexCreate(CACHE_NAME, CACHE_NAME, TBL_NAME, idx, false, 0); - idxLatch1.countDown(); - idxLatch2.countDown(); + idxLatch1.await(); + idxLatch2.await(); // Start two more nodes and unblock index operation in the middle. ignitionStart(serverConfiguration(3)); @@ -456,7 +456,7 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde final IgniteInternalFuture<?> idxFut = queryProcessor(srv1).dynamicIndexCreate(CACHE_NAME, CACHE_NAME, TBL_NAME, idx, false, 0); - idxLatch.countDown(); + idxLatch.await(); // Destroy cache (drop table). destroySqlCache(cli);
