Repository: ignite Updated Branches: refs/heads/master 73902a237 -> 67be050a2
IGNITE-8487 tmpfs is employed by ZooKeeper tests - Fixes #3994. Signed-off-by: dpavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/67be050a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/67be050a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/67be050a Branch: refs/heads/master Commit: 67be050a2c7b9efdef2388c579fc060c68ff8a38 Parents: 73902a2 Author: Sergey Chugunov <[email protected]> Authored: Mon May 14 20:09:33 2018 +0300 Committer: dpavlov <[email protected]> Committed: Mon May 14 20:09:33 2018 +0300 ---------------------------------------------------------------------- .../discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java | 7 ++++++- .../ignite/spi/discovery/zk/internal/ZookeeperClientTest.java | 3 ++- .../spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java | 5 +++-- 3 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/67be050a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java index 766635c..c5d3488 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiAbstractTestSuite.java @@ -76,7 +76,12 @@ public abstract class ZookeeperDiscoverySpiAbstractTestSuite extends TestSuite { * @return Test cluster. */ public static TestingCluster createTestingCluster(int instances) { - String tmpDir = System.getProperty("java.io.tmpdir"); + String tmpDir; + + if (System.getenv("TMPFS_ROOT") != null) + tmpDir = System.getenv("TMPFS_ROOT"); + else + tmpDir = System.getProperty("java.io.tmpdir"); List<InstanceSpec> specs = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ignite/blob/67be050a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java index e7cb97a..d228e03 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientTest.java @@ -31,6 +31,7 @@ import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteRunnable; +import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpiAbstractTestSuite; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.zookeeper.AsyncCallback; @@ -462,7 +463,7 @@ public class ZookeeperClientTest extends GridCommonAbstractTest { private void startZK(int instances) throws Exception { assert zkCluster == null; - zkCluster = new TestingCluster(instances); + zkCluster = ZookeeperDiscoverySpiAbstractTestSuite.createTestingCluster(instances); zkCluster.start(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/67be050a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java index 09db104..1585870 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java @@ -118,6 +118,7 @@ import org.apache.ignite.spi.discovery.DiscoverySpi; import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.DiscoverySpiNodeAuthenticator; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi; +import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpiAbstractTestSuite; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpiMBean; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpiTestSuite2; import org.apache.ignite.testframework.GridTestUtils; @@ -421,7 +422,7 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest { super.beforeTest(); if (USE_TEST_CLUSTER && zkCluster == null) { - zkCluster = ZookeeperDiscoverySpiTestSuite2.createTestingCluster(ZK_SRVS); + zkCluster = ZookeeperDiscoverySpiAbstractTestSuite.createTestingCluster(ZK_SRVS); zkCluster.start(); } @@ -4315,7 +4316,7 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest { ThreadLocalRandom rnd = ThreadLocalRandom.current(); while (!stop.get() && System.currentTimeMillis() < stopTime) { - U.sleep(rnd.nextLong(500) + 500); + U.sleep(rnd.nextLong(2500) + 2500); int idx = rnd.nextInt(ZK_SRVS);
