You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/12/05 07:31:26 UTC
[11/11] ignite git commit: zk
zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be7ae489
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be7ae489
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be7ae489
Branch: refs/heads/ignite-zk
Commit: be7ae489bb2cb9b1f45fecc0d54a5a6d6029c34b
Parents: 017f8cb
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 5 10:28:48 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 5 10:28:48 2017 +0300
----------------------------------------------------------------------
.../ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/be7ae489/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index 2d2ff01..f62706e 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -203,10 +203,13 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery
Integer commPort = (Integer)locNodeAttrs.get(
TcpCommunicationSpi.class.getSimpleName() + "." + TcpCommunicationSpi.ATTR_PORT);
- if (commPort == null)
- throw new IgniteSpiException("Can not initialized consistent ID.");
+ if (commPort == null) {
+ U.warn(log, "Can not initialize default consistentId, TcpCommunicationSpi port is not initialized.");
- consistentId = U.consistentId(sortedAddrs, (Integer)commPort);
+ consistentId = ignite.configuration().getNodeId();
+ }
+ else
+ consistentId = U.consistentId(sortedAddrs, commPort);
}
}
}