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/29 15:42:01 UTC
[ignite] 01/01: ignite-11108 ZK discovery: pass joining node data
in SpiContext.validateNode
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 6b2e2ce440598fcfb52b474bca4ea303e9065731
Author: sboikov <sb...@apache.org>
AuthorDate: Tue Jan 29 18:41:50 2019 +0300
ignite-11108 ZK discovery: pass joining node data in SpiContext.validateNode
---
.../spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 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 544168f..f57d8b1 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
@@ -2006,11 +2006,15 @@ public class ZookeeperDiscoveryImpl {
if (res.err != null)
return res;
- DiscoveryDataBag joiningNodeBag = new DiscoveryDataBag(node.id(), joiningNodeData.node().isClient());
+ IgniteNodeValidationResult err = spi.getSpiContext().validateNode(node);
- joiningNodeBag.joiningNodeData(joiningNodeData.discoveryData());
+ if (err == null) {
+ DiscoveryDataBag joiningNodeBag = new DiscoveryDataBag(node.id(), joiningNodeData.node().isClient());
- IgniteNodeValidationResult err = spi.getSpiContext().validateNode(node, joiningNodeBag);
+ joiningNodeBag.joiningNodeData(joiningNodeData.discoveryData());
+
+ err = spi.getSpiContext().validateNode(node, joiningNodeBag);
+ }
if (err != null) {
LT.warn(log, err.message());