Repository: ignite Updated Branches: refs/heads/master c8b3ba496 -> 774ed773a
IGNITE-9127 ZooKeeper (Discovery) 1 suite hang, JMX logging disabled for ZK - Fixes #4450. Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/774ed773 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/774ed773 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/774ed773 Branch: refs/heads/master Commit: 774ed773a6786cbcd4e6ca7f12290211f4f52201 Parents: c8b3ba4 Author: Vitaliy Biryukov <[email protected]> Authored: Mon Jul 30 20:33:04 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Mon Jul 30 20:33:04 2018 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java | 1 + .../spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/774ed773/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java index 7096cf9..fa60244 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite1.java @@ -54,6 +54,7 @@ public class ZookeeperDiscoverySpiTestSuite1 extends TestSuite { */ public static TestSuite suite() throws Exception { System.setProperty("zookeeper.forceSync", "false"); + System.setProperty("zookeeper.jmx.log4j.disable", "true"); TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite"); http://git-wip-us.apache.org/repos/asf/ignite/blob/774ed773/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 077c4da..6925a5e 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 @@ -505,7 +505,7 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest { * @throws Exception If failed. */ private void checkInternalStructuresCleanup() throws Exception { - for (Ignite node : G.allGrids()) { + for (Ignite node : IgnitionEx.allGridsx()) { final AtomicReference<?> res = GridTestUtils.getFieldValue(spi(node), "impl", "commErrProcFut"); GridTestUtils.waitForCondition(new GridAbsPredicate() {
