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 2019/01/28 16:13:30 UTC
[ignite] 01/01: ignite-11108
This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-11108
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 62c5a66562165260c85e6e752e79382e80b0d525
Author: sboikov <sb...@apache.org>
AuthorDate: Mon Jan 28 19:13:09 2019 +0300
ignite-11108
---
.../discovery/zk/internal/ZookeeperDiscoveryImpl.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
index d57c8d6..544168f 100644
--- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
@@ -1718,7 +1718,7 @@ public class ZookeeperDiscoveryImpl {
List<T2<ZkJoinedNodeEvtData, Map<Integer, Serializable>>> nodes = joinCtx.nodes;
- assert nodes != null && nodes.size() > 0;
+ assert nodes != null && !nodes.isEmpty();
int nodeCnt = nodes.size();
@@ -1924,7 +1924,7 @@ public class ZookeeperDiscoveryImpl {
if (data instanceof ZkJoiningNodeData) {
ZkJoiningNodeData joiningNodeData = (ZkJoiningNodeData)data;
- ZkNodeValidateResult validateRes = validateJoiningNode(joiningNodeData.node());
+ ZkNodeValidateResult validateRes = validateJoiningNode(joiningNodeData);
if (validateRes.err == null) {
ZookeeperClusterNode joinedNode = joiningNodeData.node();
@@ -1985,10 +1985,12 @@ public class ZookeeperDiscoveryImpl {
}
/**
- * @param node Joining node.
+ * @param node Joining node data.
* @return Validation result.
*/
- private ZkNodeValidateResult validateJoiningNode(ZookeeperClusterNode node) {
+ private ZkNodeValidateResult validateJoiningNode(ZkJoiningNodeData joiningNodeData) {
+ ZookeeperClusterNode node = joiningNodeData.node();
+
ZookeeperClusterNode node0 = rtState.top.nodesById.get(node.id());
if (node0 != null) {
@@ -2004,7 +2006,11 @@ public class ZookeeperDiscoveryImpl {
if (res.err != null)
return res;
- IgniteNodeValidationResult err = spi.getSpiContext().validateNode(node);
+ DiscoveryDataBag joiningNodeBag = new DiscoveryDataBag(node.id(), joiningNodeData.node().isClient());
+
+ joiningNodeBag.joiningNodeData(joiningNodeData.discoveryData());
+
+ IgniteNodeValidationResult err = spi.getSpiContext().validateNode(node, joiningNodeBag);
if (err != null) {
LT.warn(log, err.message());