Repository: ignite Updated Branches: refs/heads/master f00bdad33 -> be36d3070
IGNITE-9654 Fixed an issue with testJoinQueryUnstableTopology flaky test - Fixes #4797. 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/be36d307 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be36d307 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be36d307 Branch: refs/heads/master Commit: be36d3070166c375b0eb9bd0239c7084aa6981b9 Parents: f00bdad Author: NSAmelchev <nsamelc...@gmail.com> Authored: Thu Sep 27 17:07:41 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Thu Sep 27 17:07:41 2018 +0300 ---------------------------------------------------------------------- ...eCacheDistributedPartitionQueryAbstractSelfTest.java | 11 +++++++---- ...heDistributedPartitionQueryNodeRestartsSelfTest.java | 12 +++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/be36d307/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java index b66f6c4..7a83014 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java @@ -509,12 +509,15 @@ public abstract class IgniteCacheDistributedPartitionQueryAbstractSelfTest exten if (regionId == UNMAPPED_REGION) fail(); } - catch (CacheException ignored) { - if (X.hasCause(ignored, InterruptedException.class, IgniteInterruptedCheckedException.class)) + catch (CacheException e) { + if (X.hasCause(e, InterruptedException.class, IgniteInterruptedCheckedException.class)) return; // Allow interruptions. - if (regionId != UNMAPPED_REGION) - fail(); + if (regionId != UNMAPPED_REGION) { + e.printStackTrace(System.err); + + fail("Unexpected exception (see details above): " + e.getMessage()); + } } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/be36d307/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java index 806fbbf..e6a4e73 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.query.h2.twostep.GridReduceQueryExecutor; +import org.apache.ignite.internal.util.typedef.internal.U; /** * Tests distributed queries over set of partitions on unstable topology. @@ -110,14 +111,15 @@ public class IgniteCacheDistributedPartitionQueryNodeRestartsSelfTest extends } }, RESTART_THREADS_CNT); - try { - fut2.get(60, TimeUnit.SECONDS); - } catch (IgniteFutureTimeoutCheckedException ignored) { - stop.set(true); - } + // Test duration. + U.sleep(60_000); + + stop.set(true); try { fut.get(); + + fut2.get(); } finally { log().info("Queries count: " + cnt.get());
