Repository: ignite Updated Branches: refs/heads/master 3da3fefc9 -> 91c9271a0
IGNITE-8400 IgniteTopologyValidatorGridSplitCacheTest.testTopologyValidatorWithCacheGroup node failure fix Signed-off-by: Andrey Gura <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/91c9271a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/91c9271a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/91c9271a Branch: refs/heads/master Commit: 91c9271a06f7fb48f8fec5446390fb932e26523a Parents: 3da3fef Author: Aleksey Plekhanov <[email protected]> Authored: Mon May 7 15:52:58 2018 +0300 Committer: Andrey Gura <[email protected]> Committed: Mon May 7 15:52:58 2018 +0300 ---------------------------------------------------------------------- .../dht/IgniteCacheTopologySplitAbstractTest.java | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/91c9271a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTopologySplitAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTopologySplitAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTopologySplitAbstractTest.java index 9d978e2..4422d1e 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTopologySplitAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheTopologySplitAbstractTest.java @@ -55,9 +55,7 @@ public abstract class IgniteCacheTopologySplitAbstractTest extends GridCommonAbs @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setFailureDetectionTimeout(3_000L); - - cfg.setDiscoverySpi(new SplitTcpDiscoverySpi()); + cfg.setDiscoverySpi(new SplitTcpDiscoverySpi().setReconnectCount(2)); cfg.setCommunicationSpi(new TestRecordingCommunicationSpi()); @@ -205,18 +203,8 @@ public abstract class IgniteCacheTopologySplitAbstractTest extends GridCommonAbs * @throws SocketTimeoutException If segmented. */ protected void checkSegmented(InetSocketAddress sockAddr, long timeout) throws SocketTimeoutException { - if (segmented(sockAddr)) { - if (timeout > 0) { - try { - Thread.sleep(timeout); - } - catch (InterruptedException e) { - // No-op. - } - } - + if (segmented(sockAddr)) throw new SocketTimeoutException("Fake socket timeout."); - } } /** {@inheritDoc} */
