Repository: ignite Updated Branches: refs/heads/master dbf557400 -> 17e7bd731
IGNITE-9236 Removed setting failureDetectionTimeout to Ingeger.MAX_VALUE in tests. - Fixes #4499. 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/17e7bd73 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/17e7bd73 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/17e7bd73 Branch: refs/heads/master Commit: 17e7bd731fcf5157a4ac8743d27bad6c308f1412 Parents: dbf5574 Author: Ilya Lantukh <ilant...@gridgain.com> Authored: Fri Aug 10 15:45:36 2018 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Fri Aug 10 15:45:36 2018 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridAffinityMappedTest.java | 2 -- .../java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java | 2 -- .../test/java/org/apache/ignite/internal/GridAffinitySelfTest.java | 2 -- .../internal/processors/cache/GridCacheAbstractSelfTest.java | 2 -- .../internal/processors/cache/GridCacheMvccManagerSelfTest.java | 1 - .../ignite/internal/processors/cache/IgniteCacheAbstractTest.java | 2 -- .../cache/distributed/GridCacheNodeFailureAbstractTest.java | 1 - .../dht/GridCacheColocatedTxSingleThreadedSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java | 1 - .../cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java | 1 - .../cache/distributed/near/GridCacheNearMultiGetSelfTest.java | 1 - .../cache/distributed/near/GridCacheNearMultiNodeSelfTest.java | 1 - .../near/GridCachePartitionedTxSingleThreadedSelfTest.java | 1 - .../internal/processors/cache/query/IndexingSpiQuerySelfTest.java | 2 -- 14 files changed, 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java index 0622453..79c9031 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java @@ -59,8 +59,6 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); - if (igniteInstanceName.endsWith("1")) cfg.setCacheConfiguration(); // Empty cache configuration. else { http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java index 35ebb0d..7061e75 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityP2PSelfTest.java @@ -89,8 +89,6 @@ public class GridAffinityP2PSelfTest extends GridCommonAbstractTest { c.setDiscoverySpi(disco); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); - c.setDeploymentMode(depMode); if (igniteInstanceName.endsWith("1")) http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java index 1d9a587..db49729 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinitySelfTest.java @@ -53,8 +53,6 @@ public class GridAffinitySelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); - if (igniteInstanceName.endsWith("1")) cfg.setClientMode(true); else { http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index 16e7de4..89f0ca7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -201,8 +201,6 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); disco.setIpFinder(ipFinder); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java index 993a1cf..0a284e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMvccManagerSelfTest.java @@ -55,7 +55,6 @@ public class GridCacheMvccManagerSelfTest extends GridCommonAbstractTest { cfg.setDiscoverySpi(disco); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); cfg.setCacheConfiguration(cacheConfiguration()); return cfg; http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java index 54b561b..862ba6a 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java @@ -97,8 +97,6 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest { MemoryEventStorageSpi evtSpi = new MemoryEventStorageSpi(); evtSpi.setExpireCount(100); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); - cfg.setEventStorageSpi(evtSpi); cfg.setDiscoverySpi(disco); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java index d98903f..8de2d79 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java @@ -90,7 +90,6 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac disco.setIpFinder(ipFinder); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); c.setDiscoverySpi(disco); c.setDeploymentMode(DeploymentMode.SHARED); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java index 644fabd..c55a606 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheColocatedTxSingleThreadedSelfTest.java @@ -65,7 +65,6 @@ public class GridCacheColocatedTxSingleThreadedSelfTest extends IgniteTxSingleTh spi.setIpFinder(ipFinder); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); c.setDiscoverySpi(spi); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java index 0105ece..c509366 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadDelayedSelfTest.java @@ -94,7 +94,6 @@ public class GridCacheDhtPreloadDelayedSelfTest extends GridCommonAbstractTest { disco.setIpFinder(ipFinder); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); c.setDiscoverySpi(disco); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java index e2a8009..886a886 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMessageCountTest.java @@ -67,7 +67,6 @@ public class GridCacheDhtPreloadMessageCountTest extends GridCommonAbstractTest disco.setIpFinder(ipFinder); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); c.setDiscoverySpi(disco); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java index e3a00c0..e27c9ad 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java @@ -83,7 +83,6 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest { spi.setIpFinder(ipFinder); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); c.setDiscoverySpi(spi); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java index ee82d5c..06e1862 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java @@ -107,7 +107,6 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest { spi.setIpFinder(ipFinder); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); cfg.setDiscoverySpi(spi); CacheConfiguration cacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java index ef472a1..17936a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedTxSingleThreadedSelfTest.java @@ -64,7 +64,6 @@ public class GridCachePartitionedTxSingleThreadedSelfTest extends IgniteTxSingle spi.setIpFinder(ipFinder); - c.setFailureDetectionTimeout(Integer.MAX_VALUE); c.setDiscoverySpi(spi); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/ignite/blob/17e7bd73/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java index b6e32d5..5f2e2ed 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/IndexingSpiQuerySelfTest.java @@ -78,8 +78,6 @@ public class IndexingSpiQuerySelfTest extends TestCase { cfg.setDiscoverySpi(disco); - cfg.setFailureDetectionTimeout(Integer.MAX_VALUE); - return cfg; }
