zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/52174ef7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/52174ef7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/52174ef7 Branch: refs/heads/ignite-zk Commit: 52174ef77761247dfefea7d1b90833ca816fb761 Parents: b37c35f Author: sboikov <sboi...@gridgain.com> Authored: Fri Dec 8 15:11:56 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Dec 8 15:11:56 2017 +0300 ---------------------------------------------------------------------- .../processors/continuous/GridContinuousProcessor.java | 6 +++--- .../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 8 +------- 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/52174ef7/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index 0583a8a..2e5bf47 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -2398,7 +2398,7 @@ public class GridContinuousProcessor extends GridProcessorAdapter { expRes++; } - if (expRes == res.size()) + if (res.size() >= expRes) res0 = createRegisterResults(); } @@ -2414,12 +2414,12 @@ public class GridContinuousProcessor extends GridProcessorAdapter { RoutineRegisterResults res0 = null; synchronized (res) { - if (res.containsKey(nodeId) || (topVer != null && res.size() == expRes)) + if (res.containsKey(nodeId) || (topVer != null && res.size() >= expRes)) return; res.put(nodeId, msg); - if (topVer != null && expRes == res.size()) + if (topVer != null && res.size() >= expRes) res0 = createRegisterResults(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/52174ef7/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 105f71b..814406a 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 @@ -2468,13 +2468,9 @@ public class ZookeeperDiscoveryImpl { return; try { - if (evt.getType() == Event.EventType.NodeDeleted) { + if (evt.getType() == Event.EventType.NodeDeleted) onPreviousNodeFail(); - } else { - if (log.isInfoEnabled()) - log.info("Previous node watch event: " + evt); - if (evt.getType() != Event.EventType.None) rtState.zkClient.existsAsync(evt.getPath(), this, this); } @@ -2492,8 +2488,6 @@ public class ZookeeperDiscoveryImpl { return; try { - log.info("Previous node stat callback [rc=" + rc + ", path=" + path + ", stat=" + stat + ']'); - assert rc == 0 || rc == KeeperException.Code.NONODE.intValue() : KeeperException.Code.get(rc); if (rc == KeeperException.Code.NONODE.intValue() || stat == null)
