Repository: ignite Updated Branches: refs/heads/ignite-zk f56fc6573 -> f76526396
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7652639 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7652639 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7652639 Branch: refs/heads/ignite-zk Commit: f76526396abe3fedf5e0c519494054443ab2e74b Parents: f56fc65 Author: sboikov <[email protected]> Authored: Thu Nov 23 15:33:39 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Nov 23 15:33:39 2017 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/internal/ZkEventAckFuture.java | 3 ++- .../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f7652639/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkEventAckFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkEventAckFuture.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkEventAckFuture.java index ab0dad9..ffe65c3 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkEventAckFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZkEventAckFuture.java @@ -23,6 +23,7 @@ import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.util.future.GridFutureAdapter; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.zookeeper.AsyncCallback; +import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.data.Stat; @@ -119,7 +120,7 @@ public class ZkEventAckFuture extends GridFutureAdapter<Void> implements Watcher /** {@inheritDoc} */ @Override public void processResult(int rc, String path, Object ctx, List<String> children, Stat stat) { - assert rc == 0 : rc; + assert rc == 0 : KeeperException.Code.get(rc); if (isDone()) return; http://git-wip-us.apache.org/repos/asf/ignite/blob/f7652639/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 e180d7a..1cfa2eb 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 @@ -426,7 +426,7 @@ public class ZookeeperDiscoveryImpl { */ private void checkIsCoordinator(int rc, final List<String> aliveNodes) { try { - assert rc == 0 : rc; + assert rc == 0 : KeeperException.Code.get(rc); TreeMap<Integer, String> alives = new TreeMap<>(); @@ -498,7 +498,7 @@ public class ZookeeperDiscoveryImpl { @Override public void processResult(int rc, String path, Object ctx, Stat stat) { log.info("Previous node stat callback [rc=" + rc + ", path=" + path + ", stat=" + stat + ']'); - assert rc == 0 || rc == KeeperException.Code.NONODE.intValue() : rc; + assert rc == 0 || rc == KeeperException.Code.NONODE.intValue() : KeeperException.Code.get(rc); if (rc == KeeperException.Code.NONODE.intValue() || stat == null) { try { @@ -610,7 +610,7 @@ public class ZookeeperDiscoveryImpl { return; } - assert rc == 0 : rc; + assert rc == 0 : KeeperException.Code.get(rc); try { if (data.length > 0) { @@ -1448,7 +1448,7 @@ public class ZookeeperDiscoveryImpl { /** {@inheritDoc} */ @Override public void processResult(int rc, String path, Object ctx, List<String> children, Stat stat) { try { - assert rc == 0 : rc; + assert rc == 0 : KeeperException.Code.get(rc); if (path.equals(zkPaths.aliveNodesDir)) generateTopologyEvents(children); @@ -1470,7 +1470,7 @@ public class ZookeeperDiscoveryImpl { /** {@inheritDoc} */ @Override public void processResult(int rc, String path, Object ctx, byte[] data, Stat stat) { try { - assert rc == 0 : rc; + assert rc == 0 : KeeperException.Code.get(rc); if (path.equals(zkPaths.evtsPath)) { if (!crd)
