Repository: ignite Updated Branches: refs/heads/ignite-zk 9ffd603d2 -> 7611371b9
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7611371b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7611371b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7611371b Branch: refs/heads/ignite-zk Commit: 7611371b94559e3934b1224a17aaf408c735b358 Parents: 9ffd603 Author: sboikov <sboi...@gridgain.com> Authored: Thu Nov 23 13:52:06 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Nov 23 13:52:06 2017 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/zk/internal/ZkIgnitePaths.java | 5 ++++- .../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 9 +++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7611371b/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 9f1b859..2936876 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 @@ -232,7 +232,10 @@ class ZkIgnitePaths { * @return Event node ID. */ static UUID customEventSendNodeId(String path) { - String idStr = path.substring(0, ZkIgnitePaths.UUID_LEN); + // <uuid prefix>:<node id>|<seq> + int startIdx = ZkIgnitePaths.UUID_LEN + 1; + + String idStr = path.substring(startIdx, startIdx + ZkIgnitePaths.UUID_LEN); return UUID.fromString(idStr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7611371b/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 a04314d..e49471c 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 @@ -249,8 +249,13 @@ public class ZookeeperDiscoveryImpl { } try { - // TODO ZK: handle retries. - zkClient.createIfNeeded(zkPaths.customEvtsDir + "/" + locNode.id() + '|', msgBytes, CreateMode.PERSISTENT_SEQUENTIAL); + String prefix = UUID.randomUUID().toString(); + + zkClient.createSequential(prefix, + zkPaths.customEvtsDir, + prefix + ":" + locNode.id() + '|', + msgBytes, + CreateMode.PERSISTENT_SEQUENTIAL); } catch (ZookeeperClientFailedException e) { throw new IgniteException(e);
