Repository: ignite Updated Branches: refs/heads/ignite-zk d8c52dc54 -> eba59c38a
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a8a7d0c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a8a7d0c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a8a7d0c Branch: refs/heads/ignite-zk Commit: 4a8a7d0c3d21a8cd3814148c2c671c4163645107 Parents: d8c52dc Author: sboikov <[email protected]> Authored: Wed Nov 29 15:39:23 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 29 15:39:23 2017 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 32 +++++--------------- .../discovery/zk/internal/ZkIgnitePaths.java | 18 +++-------- .../zk/internal/ZookeeperDiscoveryImpl.java | 16 ++++------ .../ZookeeperDiscoverySpiBasicTest.java | 2 +- 4 files changed, 19 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8a7d0c/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index e4450d0..b036462 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -59,15 +59,11 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery /** */ @GridToStringInclude - private int sesTimeout = 5000; + private int sesTimeout = 10_000; /** */ @GridToStringInclude - private String basePath = "/apacheIgnite"; - - /** */ - @GridToStringInclude - private String clusterName = "default"; + private String zkRootPath = "/apacheIgnite"; /** */ @GridToStringExclude @@ -109,22 +105,12 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery /** */ private boolean clientReconnectDisabled; - public String getBasePath() { - return basePath; - } - - public ZookeeperDiscoverySpi setBasePath(String basePath) { - this.basePath = basePath; - - return this; - } - - public String getClusterName() { - return clusterName; + public String getZkRootPath() { + return zkRootPath; } - public ZookeeperDiscoverySpi setClusterName(String clusterName) { - this.clusterName = clusterName; + public ZookeeperDiscoverySpi setZkRootPath(String zkRootPath) { + this.zkRootPath = zkRootPath; return this; } @@ -280,16 +266,14 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery log.info("Start Zookeeper discovery [zkConnectionString=" + zkConnectionString + ", sesTimeout=" + sesTimeout + - ", basePath=" + basePath + - ", clusterName=" + clusterName + ']'); + ", rootPath=" + zkRootPath + ']'); impl = new ZookeeperDiscoveryImpl( igniteInstanceName, zkConnectionString, sesTimeout, log, - basePath, - clusterName, + zkRootPath, locNode, lsnr, exchange, http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8a7d0c/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java index 535df93..0e427b9 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkIgnitePaths.java @@ -42,12 +42,6 @@ class ZkIgnitePaths { private static final String DISCO_EVENTS_PATH = "e"; /** */ - final String basePath; - - /** */ - private final String clusterName; - - /** */ final String clusterDir; /** */ @@ -66,14 +60,10 @@ class ZkIgnitePaths { final String customEvtsAcksDir; /** - * @param basePath Base directory. - * @param clusterName Cluster name. + * @param zkRootPath Base Zookeeper directory for all Ignite nodes. */ - ZkIgnitePaths(String basePath, String clusterName) { - this.basePath = basePath; - this.clusterName = clusterName; - - clusterDir = basePath + "/" + clusterName; + ZkIgnitePaths(String zkRootPath) { + clusterDir = zkRootPath; aliveNodesDir = zkPath(ALIVE_NODES_DIR); joinDataDir = zkPath(JOIN_DATA_DIR); @@ -172,7 +162,7 @@ class ZkIgnitePaths { * @return Full path. */ private String zkPath(String path) { - return basePath + "/" + clusterName + "/" + path; + return clusterDir + "/" + path; } String joiningNodeDataPath(UUID nodeId, String aliveNodePath) { http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8a7d0c/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index 60396b0..5886a23 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -136,8 +136,7 @@ public class ZookeeperDiscoveryImpl { /** * @param log Logger. - * @param basePath Zookeeper base path node all nodes. - * @param clusterName Cluster name. + * @param zkRootPath Zookeeper base path node all nodes. * @param locNode Local node instance. * @param lsnr Discovery events listener. * @param exchange Discovery data exchange. @@ -147,20 +146,16 @@ public class ZookeeperDiscoveryImpl { String connectString, int sesTimeout, IgniteLogger log, - String basePath, - String clusterName, + String zkRootPath, ZookeeperClusterNode locNode, DiscoverySpiListener lsnr, DiscoverySpiDataExchange exchange, boolean clientReconnectEnabled) { assert locNode.id() != null && locNode.isLocal() : locNode; - if (F.isEmpty(clusterName)) - throw new IllegalArgumentException("Cluster name is empty."); + ZkIgnitePaths.validatePath(zkRootPath); - ZkIgnitePaths.validatePath(basePath); - - zkPaths = new ZkIgnitePaths(basePath, clusterName); + zkPaths = new ZkIgnitePaths(zkRootPath); this.igniteInstanceName = igniteInstanceName; this.connectString = connectString; @@ -405,7 +400,8 @@ public class ZookeeperDiscoveryImpl { List<String> dirs = new ArrayList<>(); - dirs.add(zkPaths.basePath); + // TODO ZK: test create all parents? + dirs.add(zkPaths.clusterDir); dirs.add(zkPaths.evtsPath); dirs.add(zkPaths.joinDataDir); http://git-wip-us.apache.org/repos/asf/ignite/blob/4a8a7d0c/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java index a46c678..f98d66a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java @@ -81,7 +81,7 @@ import static org.apache.zookeeper.ZooKeeper.ZOOKEEPER_CLIENT_CNXN_SOCKET; */ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { /** */ - private static final String IGNITE_ZK_ROOT = "/apacheIgnite/default"; + private static final String IGNITE_ZK_ROOT = "/apacheIgnite"; /** */ private static final int ZK_SRVS = 3;
