From a3e369841a603795bad82caacde383ed3da5d097 Mon Sep 17 00:00:00 2001 From: NSAmelchev Date: Thu, 17 Oct 2019 22:03:05 +0300 Subject: [PATCH 1/5] Fix test --- ...scoveryTopologyChangeAndReconnectTest.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java index d85ec34ad2e70..3ed42e765719f 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java @@ -31,7 +31,6 @@ import java.util.stream.Collectors; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCache; -import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction; import org.apache.ignite.configuration.CacheConfiguration; @@ -45,8 +44,10 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteInClosure; import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi; import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.WithSystemProperty; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZKUtil; import org.apache.zookeeper.ZkTestClientCnxnSocketNIO; @@ -54,6 +55,7 @@ import org.junit.Ignore; import org.junit.Test; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_SQL_DISABLE_SYSTEM_VIEWS; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED; @@ -562,6 +564,7 @@ public void testForcibleClientFail() throws Exception { * @throws Exception If failed. */ @Test + @WithSystemProperty(key = IGNITE_SQL_DISABLE_SYSTEM_VIEWS, value = "true") public void testDuplicatedNodeId() throws Exception { UUID nodeId0 = nodeId = UUID.randomUUID(); @@ -569,25 +572,15 @@ public void testDuplicatedNodeId() throws Exception { int failingNodeIdx = 100; - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 2; i++) { final int idx = failingNodeIdx++; nodeId = nodeId0; info("Start node with duplicated ID [iter=" + i + ", nodeId=" + nodeId + ']'); - Throwable err = GridTestUtils.assertThrows(log, new Callable() { - @Override public Void call() throws Exception { - startGrid(idx); - - return null; - } - }, IgniteCheckedException.class, null); - - assertTrue(err instanceof IgniteCheckedException); - - assertTrue(err.getMessage().contains("Failed to start processor:") - || err.getMessage().contains("Failed to start manager:")); + GridTestUtils.assertThrowsAnyCause(log, + () -> startGrid(idx), IgniteSpiException.class, "Node with the same ID already exists"); nodeId = null; From 4a188de9ae71f8f807530e2afc96efb60c8833ce Mon Sep 17 00:00:00 2001 From: NSAmelchev Date: Mon, 21 Oct 2019 14:04:35 +0300 Subject: [PATCH 2/5] Fix test, add indexing disabled flag --- ...scoveryTopologyChangeAndReconnectTest.java | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java index 3ed42e765719f..6cf9d4a21c75d 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java @@ -39,6 +39,8 @@ import org.apache.ignite.events.EventType; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest; +import org.apache.ignite.internal.processors.query.DummyQueryIndexing; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.internal.U; @@ -46,8 +48,9 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi; +import org.apache.ignite.spi.systemview.jmx.JmxSystemViewExporterSpi; +import org.apache.ignite.spi.systemview.view.SystemView; import org.apache.ignite.testframework.GridTestUtils; -import org.apache.ignite.testframework.junits.WithSystemProperty; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZKUtil; import org.apache.zookeeper.ZkTestClientCnxnSocketNIO; @@ -55,7 +58,6 @@ import org.junit.Ignore; import org.junit.Test; -import static org.apache.ignite.IgniteSystemProperties.IGNITE_SQL_DISABLE_SYSTEM_VIEWS; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED; import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_RECONNECTED; @@ -64,11 +66,33 @@ * Tests for Zookeeper SPI discovery. */ public class ZookeeperDiscoveryTopologyChangeAndReconnectTest extends ZookeeperDiscoverySpiTestBase { + /** {@code True} if indexing disabled. */ + private boolean indexingDisabled; + /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception { - return super.getConfiguration(igniteInstanceName).setIncludeEventTypes(EventType.EVTS_ALL); + IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName); + + cfg.setIncludeEventTypes(EventType.EVTS_ALL); + + if (indexingDisabled) { + GridQueryProcessor.idxCls = DummyQueryIndexing.class; + + cfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi() { + @Override protected void register(SystemView sysView) { + // No-op. + } + }); + } + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void afterTest() { + indexingDisabled = false; } - + /** * @throws Exception If failed. */ @@ -564,8 +588,9 @@ public void testForcibleClientFail() throws Exception { * @throws Exception If failed. */ @Test - @WithSystemProperty(key = IGNITE_SQL_DISABLE_SYSTEM_VIEWS, value = "true") public void testDuplicatedNodeId() throws Exception { + indexingDisabled = true; + UUID nodeId0 = nodeId = UUID.randomUUID(); startGrid(0); From d4fcfd95be6514cce285dc2ce13351c67414cd72 Mon Sep 17 00:00:00 2001 From: NSAmelchev Date: Mon, 21 Oct 2019 14:43:12 +0300 Subject: [PATCH 3/5] Fix after test call --- .../ZookeeperDiscoveryTopologyChangeAndReconnectTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java index 6cf9d4a21c75d..59ad86a373e22 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java @@ -89,7 +89,9 @@ public class ZookeeperDiscoveryTopologyChangeAndReconnectTest extends ZookeeperD } /** {@inheritDoc} */ - @Override protected void afterTest() { + @Override protected void afterTest() throws Exception { + super.afterTest(); + indexingDisabled = false; } From 637dbd82e33df101f867c760c7cf143627f3b7ea Mon Sep 17 00:00:00 2001 From: NSAmelchev Date: Mon, 21 Oct 2019 16:34:33 +0300 Subject: [PATCH 4/5] Fix SqlViewExporterSpi --- .../ignite/spi/systemview/SqlViewExporterSpi.java | 8 +++++--- ...keeperDiscoveryTopologyChangeAndReconnectTest.java | 11 +++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/SqlViewExporterSpi.java b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/SqlViewExporterSpi.java index 00a813023b5f9..301bd9fa7dade 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/SqlViewExporterSpi.java +++ b/modules/indexing/src/main/java/org/apache/ignite/spi/systemview/SqlViewExporterSpi.java @@ -52,10 +52,12 @@ public class SqlViewExporterSpi extends IgniteSpiAdapter implements SystemViewEx @Override protected void onContextInitialized0(IgniteSpiContext spiCtx) throws IgniteSpiException { GridKernalContext ctx = ((IgniteEx)ignite()).context(); - this.mgr = ((IgniteH2Indexing)ctx.query().getIndexing()).schemaManager(); + if (ctx.query().getIndexing() instanceof IgniteH2Indexing) { + mgr = ((IgniteH2Indexing)ctx.query().getIndexing()).schemaManager(); - sysViewReg.forEach(this::register); - sysViewReg.addSystemViewCreationListener(this::register); + sysViewReg.forEach(this::register); + sysViewReg.addSystemViewCreationListener(this::register); + } } /** diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java index 59ad86a373e22..b13796f91e781 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java @@ -75,16 +75,9 @@ public class ZookeeperDiscoveryTopologyChangeAndReconnectTest extends ZookeeperD cfg.setIncludeEventTypes(EventType.EVTS_ALL); - if (indexingDisabled) { + if (indexingDisabled) GridQueryProcessor.idxCls = DummyQueryIndexing.class; - cfg.setSystemViewExporterSpi(new JmxSystemViewExporterSpi() { - @Override protected void register(SystemView sysView) { - // No-op. - } - }); - } - return cfg; } @@ -93,6 +86,8 @@ public class ZookeeperDiscoveryTopologyChangeAndReconnectTest extends ZookeeperD super.afterTest(); indexingDisabled = false; + + GridQueryProcessor.idxCls = null; } /** From b46d6cde2120e249edbb28af7c0da82f43918a46 Mon Sep 17 00:00:00 2001 From: NSAmelchev Date: Mon, 21 Oct 2019 17:03:45 +0300 Subject: [PATCH 5/5] Fix imports --- .../ZookeeperDiscoveryTopologyChangeAndReconnectTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java index b13796f91e781..ee17e5a53f7ad 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryTopologyChangeAndReconnectTest.java @@ -48,8 +48,6 @@ import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi; -import org.apache.ignite.spi.systemview.jmx.JmxSystemViewExporterSpi; -import org.apache.ignite.spi.systemview.view.SystemView; import org.apache.ignite.testframework.GridTestUtils; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZKUtil;