Repository: ignite Updated Branches: refs/heads/ignite-zk 22764fa00 -> dc2f9bb22
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc2f9bb2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc2f9bb2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc2f9bb2 Branch: refs/heads/ignite-zk Commit: dc2f9bb22622b34a46f9acb1861e4162f947eccb Parents: 22764fa Author: sboikov <[email protected]> Authored: Fri Jan 12 14:31:23 2018 +0300 Committer: sboikov <[email protected]> Committed: Fri Jan 12 14:44:22 2018 +0300 ---------------------------------------------------------------------- modules/zookeeper/pom.xml | 15 +++++ .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 16 +++++ .../discovery/zk/internal/ZkIgnitePaths.java | 71 -------------------- .../discovery/zk/internal/ZookeeperClient.java | 1 - .../zk/internal/ZookeeperDiscoveryImpl.java | 7 -- .../zk/ZookeeperDiscoverySpiTestSuite2.java | 17 ++++- 6 files changed, 46 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dc2f9bb2/modules/zookeeper/pom.xml ---------------------------------------------------------------------- diff --git a/modules/zookeeper/pom.xml b/modules/zookeeper/pom.xml index 9b57498..6db7470 100644 --- a/modules/zookeeper/pom.xml +++ b/modules/zookeeper/pom.xml @@ -115,6 +115,13 @@ <dependency> <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> <artifactId>ignite-log4j</artifactId> <version>${project.version}</version> <scope>test</scope> @@ -141,6 +148,14 @@ <type>test-jar</type> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.apache.ignite</groupId> + <artifactId>ignite-indexing</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/ignite/blob/dc2f9bb2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index 3b7f195..d7d3877 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -26,6 +26,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; +import org.apache.curator.utils.PathUtils; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpi; @@ -431,8 +432,23 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery sesTimeout = ignite.configuration().getFailureDetectionTimeout().intValue(); assertParameter(sesTimeout > 0, "sessionTimeout > 0"); + A.notNullOrEmpty(zkConnectionString, "zkConnectionString can not be empty"); + A.notNullOrEmpty(zkRootPath, "zkRootPath can not be empty"); + + zkRootPath = zkRootPath.trim(); + + if (zkRootPath.endsWith("/")) + zkRootPath = zkRootPath.substring(0, zkRootPath.length() - 1); + + try { + PathUtils.validatePath(zkRootPath); + } + catch (IllegalArgumentException e) { + throw new IgniteSpiException("zkRootPath is invalid: " + zkRootPath, e); + } + ZookeeperClusterNode locNode = initLocalNode(); if (log.isInfoEnabled()) { http://git-wip-us.apache.org/repos/asf/ignite/blob/dc2f9bb2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java index 642183b..9caf00f 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java @@ -86,77 +86,6 @@ class ZkIgnitePaths { } /** - * TODO ZK: copied from curator. - * - * Validate the provided znode path string - * @param path znode path string - * @return The given path if it was valid, for fluent chaining - * @throws IllegalArgumentException if the path is invalid - */ - static String validatePath(String path) throws IllegalArgumentException { - if (path == null) { - throw new IllegalArgumentException("Path cannot be null"); - } - if (path.length() == 0) { - throw new IllegalArgumentException("Path length must be > 0"); - } - if (path.charAt(0) != '/') { - throw new IllegalArgumentException( - "Path must start with / character"); - } - if (path.length() == 1) { // done checking - it's the root - return path; - } - if (path.charAt(path.length() - 1) == '/') { - throw new IllegalArgumentException( - "Path must not end with / character"); - } - - String reason = null; - char lastc = '/'; - char chars[] = path.toCharArray(); - char c; - for (int i = 1; i < chars.length; lastc = chars[i], i++) { - c = chars[i]; - - if (c == 0) { - reason = "null character not allowed @" + i; - break; - } else if (c == '/' && lastc == '/') { - reason = "empty node name specified @" + i; - break; - } else if (c == '.' && lastc == '.') { - if (chars[i-2] == '/' && - ((i + 1 == chars.length) - || chars[i+1] == '/')) { - reason = "relative paths not allowed @" + i; - break; - } - } else if (c == '.') { - if (chars[i-1] == '/' && - ((i + 1 == chars.length) - || chars[i+1] == '/')) { - reason = "relative paths not allowed @" + i; - break; - } - } else if (c > '\u0000' && c < '\u001f' - || c > '\u007f' && c < '\u009F' - || c > '\ud800' && c < '\uf8ff' - || c > '\ufff0' && c < '\uffff') { - reason = "invalid charater @" + i; - break; - } - } - - if (reason != null) { - throw new IllegalArgumentException( - "Invalid path string \"" + path + "\" caused by " + reason); - } - - return path; - } - - /** * @param path Relative path. * @return Full path. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/dc2f9bb2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java index 24954dd..e321db6 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java @@ -297,7 +297,6 @@ public class ZookeeperClient implements Watcher { onZookeeperError(connStartTime, e); } } - } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/dc2f9bb2/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index 4cd0365..c96c6cb 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -212,13 +212,6 @@ public class ZookeeperDiscoveryImpl { IgniteDiscoverySpiInternalListener internalLsnr) { assert locNode.id() != null && locNode.isLocal() : locNode; - zkRootPath = zkRootPath.trim(); - - if (zkRootPath.endsWith(ZkIgnitePaths.PATH_SEPARATOR)) - zkRootPath = zkRootPath.substring(0, zkRootPath.length() - 1); - - ZkIgnitePaths.validatePath(zkRootPath); - MarshallerUtils.setNodeName(marsh, igniteInstanceName); zkPaths = new ZkIgnitePaths(zkRootPath); http://git-wip-us.apache.org/repos/asf/ignite/blob/dc2f9bb2/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java index a37caaa..4ba9148 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestSuite2.java @@ -27,6 +27,8 @@ import org.apache.ignite.IgniteException; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.ClusterNodeMetricsUpdateTest; import org.apache.ignite.internal.IgniteClientReconnectCacheTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheEntryListenerAtomicTest; +import org.apache.ignite.internal.processors.cache.IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicMultiNodeFullApiSelfTest; @@ -36,8 +38,8 @@ import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCa import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedMultiNodeFullApiSelfTest; import org.apache.ignite.internal.processors.cache.distributed.replicated.GridCacheReplicatedNodeRestartSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicMultiJvmFullApiSelfTest; -import org.apache.ignite.internal.processors.cache.multijvm.GridCacheAtomicOnheapMultiJvmFullApiSelfTest; import org.apache.ignite.internal.processors.cache.multijvm.GridCachePartitionedMultiJvmFullApiSelfTest; +import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryAsyncFailoverAtomicSelfTest; import org.apache.ignite.internal.processors.continuous.GridEventConsumeSelfTest; import org.apache.ignite.spi.discovery.DiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; @@ -68,12 +70,19 @@ public class ZookeeperDiscoverySpiTestSuite2 extends TestSuite { TestSuite suite = new TestSuite("ZookeeperDiscoverySpi Test Suite"); suite.addTestSuite(ZookeeperDiscoverySuitePreprocessorTest.class); + + suite.addTestSuite(IgniteCacheEntryListenerAtomicTest.class); + suite.addTestSuite(GridEventConsumeSelfTest.class); + suite.addTestSuite(IgniteClientReconnectCacheTest.class); + suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class); suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class); + suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class); + suite.addTestSuite(ClusterNodeMetricsUpdateTest.class); suite.addTestSuite(GridCachePartitionedMultiNodeFullApiSelfTest.class); @@ -82,6 +91,10 @@ public class ZookeeperDiscoverySpiTestSuite2 extends TestSuite { suite.addTestSuite(GridCacheAtomicMultiNodeFullApiSelfTest.class); suite.addTestSuite(GridCacheReplicatedAtomicMultiNodeFullApiSelfTest.class); + suite.addTestSuite(CacheContinuousQueryAsyncFailoverAtomicSelfTest.class); + + suite.addTestSuite(IgniteCacheLockPartitionOnAffinityRunTxCacheOpTest.class); + suite.addTestSuite(GridCacheAtomicMultiJvmFullApiSelfTest.class); suite.addTestSuite(GridCachePartitionedMultiJvmFullApiSelfTest.class); @@ -104,7 +117,7 @@ public class ZookeeperDiscoverySpiTestSuite2 extends TestSuite { if (spi instanceof TcpDiscoverySpi) zkSpi.setClientReconnectDisabled(((TcpDiscoverySpi)spi).isClientReconnectDisabled()); - zkSpi.setSessionTimeout(20_000); + zkSpi.setSessionTimeout(30_000); zkSpi.setZkConnectionString(testingCluster.getConnectString()); cfg.setDiscoverySpi(zkSpi);
