Repository: ignite Updated Branches: refs/heads/ignite-zk e909027fa -> bbd5a889f
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/961167ab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/961167ab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/961167ab Branch: refs/heads/ignite-zk Commit: 961167ab2e3637ff8454e5e99196dd7d133e8889 Parents: e909027 Author: sboikov <[email protected]> Authored: Tue Dec 5 14:04:47 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Dec 5 14:23:40 2017 +0300 ---------------------------------------------------------------------- .../discovery/zk/internal/ZookeeperDiscoveryImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/961167ab/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 6c9d53a..e246a35 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 @@ -47,11 +47,13 @@ import org.apache.ignite.internal.managers.discovery.IgniteDiscoverySpiInternalL import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.future.GridFutureAdapter; +import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteRunnable; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.marshaller.MarshallerUtils; import org.apache.ignite.marshaller.jdk.JdkMarshaller; +import org.apache.ignite.spi.IgniteNodeValidationResult; import org.apache.ignite.spi.IgniteSpiException; import org.apache.ignite.spi.IgniteSpiTimeoutObject; import org.apache.ignite.spi.discovery.DiscoveryDataBag; @@ -977,7 +979,15 @@ public class ZookeeperDiscoveryImpl { U.error(log, "Failed to include node in cluster, node with the same ID already exists [joiningNode=" + node + ", existingNode=" + node0 + ']'); - return "Node with the same ID already exists"; + return "Node with the same ID already exists: " + node0; + } + + IgniteNodeValidationResult err = spi.getSpiContext().validateNode(node); + + if (err != null) { + LT.warn(log, err.message()); + + return err.sendMessage(); } return null;
