IGNITE-9401 Fixed race in tx rollback test - Fixes #4633. Signed-off-by: Alexey Goncharuk <alexey.goncha...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4924ed43 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4924ed43 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4924ed43 Branch: refs/heads/ignite-9273 Commit: 4924ed430f0adfd9385414d7e341393a00577d1a Parents: 13060f8 Author: Aleksei Scherbakov <alexey.scherbak...@gmail.com> Authored: Tue Aug 28 18:18:26 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Aug 28 18:18:26 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/transactions/TxRollbackAsyncTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4924ed43/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java index 646c3f0..7968be3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncTest.java @@ -27,6 +27,7 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicIntegerArray; import java.util.concurrent.atomic.AtomicReference; @@ -900,7 +901,7 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { txLatch.countDown(); - U.awaitQuiet(commitLatch); + assertTrue(U.await(commitLatch, 10, TimeUnit.SECONDS)); tx.commit(); @@ -931,6 +932,8 @@ public class TxRollbackAsyncTest extends GridCommonAbstractTest { crd.cache(CACHE_NAME).put(keys.get(0), 0); + assertTrue(U.await(commitLatch, 10, TimeUnit.SECONDS)); + tx.commit(); fail();
