IGNITE-8742 Direct IO 2 suite is timed out by 'out of disk space' failure emulation test - Fixes #4158.
Signed-off-by: Ivan Rakov <ira...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0439dee3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0439dee3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0439dee3 Branch: refs/heads/ignite-8446 Commit: 0439dee3bc114a19d364920ea0e74de48d8cc707 Parents: 594df60 Author: Dmitriy Sorokin <d.w.soro...@gmail.com> Authored: Mon Jun 25 17:31:23 2018 +0300 Committer: Ivan Rakov <ira...@apache.org> Committed: Mon Jun 25 17:31:23 2018 +0300 ---------------------------------------------------------------------- .../wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java | 6 +++--- .../db/wal/IgniteNativeIoWalFlushFsyncSelfTest.java | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0439dee3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java index ccf81d8..4d26823 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java @@ -97,7 +97,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr /** {@inheritDoc} */ @Override protected long getTestTimeout() { - return 60_000; + return 120_000; } /** @@ -161,7 +161,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr /** * @throws Exception if failed. */ - public void failWhilePut(boolean failWhileStart) throws Exception { + private void failWhilePut(boolean failWhileStart) throws Exception { final Ignite grid = startGridsMultiThreaded(gridCount()); grid.cluster().active(true); @@ -169,7 +169,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr IgniteCache<Object, Object> cache = grid.cache(TEST_CACHE); for (int i = 0; i < ITRS; i++) { - while (true) { + while (!Thread.currentThread().isInterrupted()) { try (Transaction tx = grid.transactions().txStart( TransactionConcurrency.PESSIMISTIC, TransactionIsolation.READ_COMMITTED)) { cache.put(i, "testValue" + i); http://git-wip-us.apache.org/repos/asf/ignite/blob/0439dee3/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNativeIoWalFlushFsyncSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNativeIoWalFlushFsyncSelfTest.java b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNativeIoWalFlushFsyncSelfTest.java index 3bf3f0c..ae5c90e 100644 --- a/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNativeIoWalFlushFsyncSelfTest.java +++ b/modules/direct-io/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteNativeIoWalFlushFsyncSelfTest.java @@ -20,10 +20,4 @@ package org.apache.ignite.internal.processors.cache.persistence.db.wal; * Native IO version of test */ public class IgniteNativeIoWalFlushFsyncSelfTest extends IgniteWalFlushFsyncSelfTest { - /** {@inheritDoc} */ - @Override public void testFailAfterStart() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-8742";); - - super.testFailAfterStart(); - } }
