Repository: ignite Updated Branches: refs/heads/ignite-zk bedc4e99e -> 1ee551c85
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1ee551c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1ee551c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1ee551c8 Branch: refs/heads/ignite-zk Commit: 1ee551c856e988287ed6beeb054d53d89cb8800d Parents: bedc4e9 Author: sboikov <sboi...@gridgain.com> Authored: Tue Nov 14 23:41:53 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Nov 14 23:41:53 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1ee551c8/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 a924b49..57e7959 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 @@ -376,7 +376,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery gridStartTime = clusterData.gridStartTime; zk.getData(EVENTS_PATH, zkWatcher, dataUpdateCallback, null); - zk.getChildren(JOIN_HIST_PATH, zkWatcher, zkChildrenUpdateCallback, null); + //zk.getChildren(JOIN_HIST_PATH, zkWatcher, zkChildrenUpdateCallback, null); zk.getChildren(ALIVE_NODES_PATH, zkWatcher, zkChildrenUpdateCallback, null); ZKJoiningNodeData joinData = new ZKJoiningNodeData(locNode, discoDataBag.joiningNodeData()); @@ -1120,7 +1120,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery try { String zkNode = JOIN_HIST_PATH + "/" + locNode.id().toString() + "-" + String.format("%010d", locNode.internalOrder() - 1); - zkCurator.delete().forPath(zkNode); + zkCurator.delete().inBackground().forPath(zkNode); } catch (Exception err) { U.error(log, "Failed to delete join history data");
