Repository: ignite Updated Branches: refs/heads/master 32469dfc9 -> 8d863555d
IGNITE-9159 Basic 2 TC configuration is halted by failure handler - Fixes #4471. Signed-off-by: Ivan Rakov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8d863555 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8d863555 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8d863555 Branch: refs/heads/master Commit: 8d863555d38dc3f327a195f51aec1bd2eacee411 Parents: 32469df Author: EdShangGG <[email protected]> Authored: Fri Aug 3 17:36:49 2018 +0300 Committer: Ivan Rakov <[email protected]> Committed: Fri Aug 3 17:36:49 2018 +0300 ---------------------------------------------------------------------- modules/core/src/test/config/example-cache.xml | 10 ++++++++++ .../dht/GridCacheDhtPreloadMultiThreadedSelfTest.java | 3 +++ .../configvariations/ConfigVariationsFactory.java | 3 +++ .../ignite/testframework/junits/GridAbstractTest.java | 2 ++ 4 files changed, 18 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8d863555/modules/core/src/test/config/example-cache.xml ---------------------------------------------------------------------- diff --git a/modules/core/src/test/config/example-cache.xml b/modules/core/src/test/config/example-cache.xml index fdae325..fe040bb 100644 --- a/modules/core/src/test/config/example-cache.xml +++ b/modules/core/src/test/config/example-cache.xml @@ -105,6 +105,16 @@ </list> </property> + <property name="dataStorageConfiguration"> + <bean class="org.apache.ignite.configuration.DataStorageConfiguration"> + <property name="defaultDataRegionConfiguration"> + <bean class="org.apache.ignite.configuration.DataRegionConfiguration"> + <property name="maxSize" value="#{200L*1024*1024}"/> + </bean> + </property> + </bean> + </property> + <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/ignite/blob/8d863555/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java index 60f2f0a..6c32a67 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtPreloadMultiThreadedSelfTest.java @@ -26,6 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; +import org.apache.ignite.failure.NoOpFailureHandler; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -167,6 +168,8 @@ public class GridCacheDhtPreloadMultiThreadedSelfTest extends GridCommonAbstract cfg.setIgniteInstanceName(igniteInstanceName); + cfg.setFailureHandler(new NoOpFailureHandler()); + for (CacheConfiguration cCfg : cfg.getCacheConfiguration()) { if (cCfg.getCacheMode() == CacheMode.PARTITIONED) { cCfg.setAffinity(new RendezvousAffinityFunction(2048, null)); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d863555/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java index bc8e9dd..2d94109 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/configvariations/ConfigVariationsFactory.java @@ -20,6 +20,7 @@ package org.apache.ignite.testframework.configvariations; import java.util.Arrays; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.failure.NoOpFailureHandler; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -65,6 +66,8 @@ public class ConfigVariationsFactory implements ConfigFactory { @Override public IgniteConfiguration getConfiguration(String igniteInstanceName, IgniteConfiguration srcCfg) { IgniteConfiguration cfg = new IgniteConfiguration(); + cfg.setFailureHandler(new NoOpFailureHandler()); + if (srcCfg != null) copyDefaultsFromSource(cfg, srcCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/8d863555/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 53ccdc7..ca1a563 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -1327,6 +1327,8 @@ public abstract class GridAbstractTest extends TestCase { protected Ignite startGrid(String igniteInstanceName, String springCfgPath) throws Exception { IgniteConfiguration cfg = loadConfiguration(springCfgPath); + cfg.setFailureHandler(getFailureHandler(igniteInstanceName)); + cfg.setGridLogger(getTestResources().getLogger()); return startGrid(igniteInstanceName, cfg);
