ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: zk
Date Fri, 24 Nov 2017 10:17:18 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-zk 33e84515e -> 815a53172


zk


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/815a5317
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/815a5317
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/815a5317

Branch: refs/heads/ignite-zk
Commit: 815a53172e411dafe0a64f8477fd250b78a59e1e
Parents: 33e8451
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Nov 24 13:17:13 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Nov 24 13:17:13 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java  | 3 +++
 .../ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java  | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/815a5317/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
index 166db4c..fb6a697 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
@@ -250,6 +250,9 @@ public class ZookeeperClient implements Watcher {
 
                 return;
             }
+            catch (KeeperException.NodeExistsException e) {
+                throw e;
+            }
             catch (Exception e) {
                 onZookeeperError(connStartTime, e);
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/815a5317/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 f9786d6..e7e2846 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
@@ -350,7 +350,8 @@ public class ZookeeperDiscoveryImpl {
                 zkClient.createAll(dirs, PERSISTENT);
             }
             catch (KeeperException.NodeExistsException e) {
-                U.warn(log, "Failed to create nodes using bulk operation: " + e);
+                if (log.isDebugEnabled())
+                    log.debug("Failed to create nodes using bulk operation: " + e);
 
                 for (String dir : dirs)
                     zkClient.createIfNeeded(dir, null, PERSISTENT);


Mime
View raw message