http://git-wip-us.apache.org/repos/asf/ignite/blob/42bbed0a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
deleted file mode 100644
index 626b235..0000000
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClient.java
+++ /dev/null
@@ -1,816 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.zk.internal;
-
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteRunnable;
-import org.apache.zookeeper.AsyncCallback;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Op;
-import org.apache.zookeeper.OpResult;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Stat;
-import org.jetbrains.annotations.Nullable;
-
-/**
- *
- */
-public class ZookeeperClient implements Watcher {
-    /** */
-    private static final long RETRY_TIMEOUT = 1000;
-
-    /** */
-    private static final List<ACL> ZK_ACL = ZooDefs.Ids.OPEN_ACL_UNSAFE;
-
-    /** */
-    private static final byte[] EMPTY_BYTES = {};
-
-    /** */
-    private final ZooKeeper zk;
-
-    /** */
-    private final IgniteLogger log;
-
-    /** */
-    private ConnectionState state = ConnectionState.Disconnected;
-
-    /** */
-    private long connLossTimeout;
-
-    /** */
-    private volatile long connStartTime;
-
-    /** */
-    private final Object stateMux = new Object();
-
-    /** */
-    private final IgniteRunnable connLostC;
-
-    /** */
-    private final Timer connTimer;
-
-    /** */
-    private final ArrayDeque<ZkAsyncOperation> retryQ = new ArrayDeque<>();
-
-    /**
-     * @param log Logger.
-     * @param connectString ZK connection string.
-     * @param sesTimeout ZK session timeout.
-     * @param connLostC Lost connection callback.
-     * @throws Exception If failed.
-     */
-    ZookeeperClient(IgniteLogger log, String connectString, int sesTimeout, 
IgniteRunnable connLostC) throws Exception {
-        this(null, log, connectString, sesTimeout, connLostC);
-    }
-
-    /**
-     * @param igniteInstanceName Ignite instance name.
-     * @param log Logger.
-     * @param connectString ZK connection string.
-     * @param sesTimeout ZK session timeout.
-     * @param connLostC Lost connection callback.
-     * @throws Exception If failed.
-     */
-    ZookeeperClient(String igniteInstanceName,
-        IgniteLogger log,
-        String connectString,
-        int sesTimeout,
-        IgniteRunnable connLostC)
-        throws Exception
-    {
-        this.log = log.getLogger(getClass());
-        this.connLostC = connLostC;
-
-        connLossTimeout = sesTimeout;
-
-        connStartTime = System.currentTimeMillis();
-
-        String threadName = Thread.currentThread().getName();
-
-        // ZK generates internal threads' names using current thread name.
-        Thread.currentThread().setName("zk-" + igniteInstanceName);
-
-        try {
-            zk = new ZooKeeper(connectString, sesTimeout, this);
-        }
-        finally {
-            Thread.currentThread().setName(threadName);
-        }
-
-        connTimer = new Timer("zk-timer-" + igniteInstanceName);
-
-        scheduleConnectionCheck();
-    }
-
-    /** {@inheritDoc} */
-    @Override public void process(WatchedEvent evt) {
-        if (evt.getType() == Event.EventType.None) {
-            ConnectionState newState;
-
-            synchronized (stateMux) {
-                if (state == ConnectionState.Lost) {
-                    U.warn(log, "Received event after connection was lost 
[evtState=" + evt.getState() + "]");
-
-                    return;
-                }
-
-                if (!zk.getState().isAlive())
-                    return;
-
-                Event.KeeperState zkState = evt.getState();
-
-                switch (zkState) {
-                    case Disconnected:
-                        newState = ConnectionState.Disconnected;
-
-                        break;
-
-                    case SyncConnected:
-                        newState = ConnectionState.Connected;
-
-                        break;
-
-                    case Expired:
-                        newState = ConnectionState.Lost;
-
-                        break;
-
-                    default:
-                        U.error(log, "Unexpected state for zookeeper client, 
close connection: " + zkState);
-
-                        newState = ConnectionState.Lost;
-                }
-
-                if (newState != state) {
-                    log.info("Zookeeper client state changed [prevState=" + 
state + ", newState=" + newState + ']');
-
-                    state = newState;
-
-                    if (newState == ConnectionState.Disconnected) {
-                        connStartTime = System.currentTimeMillis();
-
-                        scheduleConnectionCheck();
-                    }
-                    else if (newState == ConnectionState.Connected)
-                        stateMux.notifyAll();
-                    else {
-                        assert state == ConnectionState.Lost : state;
-
-                        closeClient();
-                    }
-                }
-                else
-                    return;
-            }
-
-            if (newState == ConnectionState.Lost)
-                notifyConnectionLost();
-            else if (newState == ConnectionState.Connected) {
-                for (ZkAsyncOperation op : retryQ)
-                    op.execute();
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private void notifyConnectionLost() {
-        if (state == ConnectionState.Lost && connLostC != null)
-            connLostC.run();
-    }
-
-    boolean exists(String path) throws ZookeeperClientFailedException, 
InterruptedException {
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                return zk.exists(path, false) != null;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    void createAllIfNeeded(List<String> paths, CreateMode createMode)
-        throws ZookeeperClientFailedException, InterruptedException
-    {
-        // TODO ZK: need check for max size?
-        List<Op> ops = new ArrayList<>(paths.size());
-
-        for (String path : paths)
-            ops.add(Op.create(path, EMPTY_BYTES, ZK_ACL, createMode));
-
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                zk.multi(ops);
-
-                return;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-
-    }
-
-    String createIfNeeded(String path, byte[] data, CreateMode createMode)
-        throws ZookeeperClientFailedException, InterruptedException
-    {
-        if (data == null)
-            data = EMPTY_BYTES;
-
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                return zk.create(path, data, ZK_ACL, createMode);
-            }
-            catch (KeeperException.NodeExistsException e) {
-                log.info("Node already exists: " + path);
-
-                return path;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    List<String> getChildren(String path)
-        throws ZookeeperClientFailedException, InterruptedException
-    {
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                return zk.getChildren(path, false);
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    void deleteIfExists(String path, int ver)
-        throws ZookeeperClientFailedException, InterruptedException
-    {
-        try {
-            delete(path, ver);
-        }
-        catch (KeeperException.NoNodeException e) {
-            // No-op if node does not exist.
-        }
-    }
-
-
-    void deleteAll(@Nullable String parent, List<String> paths, int ver)
-        throws KeeperException.NoNodeException, 
ZookeeperClientFailedException, InterruptedException
-    {
-        if (paths.isEmpty())
-            return;
-
-        // TODO ZK: need check for max size?
-        List<Op> ops = new ArrayList<>(paths.size());
-
-        for (String path : paths) {
-            String path0 = parent != null ? parent + "/" + path : path;
-
-            ops.add(Op.delete(path0, ver));
-        }
-
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                zk.multi(ops);
-
-                return;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    void delete(String path, int ver)
-        throws KeeperException.NoNodeException, 
ZookeeperClientFailedException, InterruptedException
-    {
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                zk.delete(path, ver);
-
-                return;
-            }
-            catch (KeeperException.NoNodeException e) {
-                throw e;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    void setData(String path, byte[] data, int ver)
-        throws ZookeeperClientFailedException, InterruptedException
-    {
-        if (data == null)
-            data = EMPTY_BYTES;
-
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                zk.setData(path, data, ver);
-
-                return;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    byte[] getData(String path)
-        throws KeeperException.NoNodeException, 
ZookeeperClientFailedException, InterruptedException
-    {
-        for (;;) {
-            long connStartTime = this.connStartTime;
-
-            try {
-                return zk.getData(path, false, null);
-            }
-            catch (KeeperException.NoNodeException e) {
-                throw e;
-            }
-            catch (Exception e) {
-                onZookeeperError(connStartTime, e);
-            }
-        }
-    }
-
-    void existsAsync(String path, Watcher watcher, AsyncCallback.StatCallback 
cb) {
-        ExistsOperation op = new ExistsOperation(path, watcher, cb);
-
-        zk.exists(path, watcher, new StatCallbackWrapper(op), null);
-    }
-
-    void getChildrenAsync(String path, Watcher watcher, 
AsyncCallback.Children2Callback cb) {
-        GetChildrenOperation op = new GetChildrenOperation(path, watcher, cb);
-
-        zk.getChildren(path, watcher, new ChildrenCallbackWrapper(op), null);
-    }
-
-    void getDataAsync(String path, Watcher watcher, AsyncCallback.DataCallback 
cb) {
-        GetDataOperation op = new GetDataOperation(path, watcher, cb);
-
-        zk.getData(path, watcher, new DataCallbackWrapper(op), null);
-    }
-
-    void createAsync(String path, byte[] data, CreateMode createMode, 
AsyncCallback.StringCallback cb) {
-        if (data == null)
-            data = EMPTY_BYTES;
-
-        CreateOperation op = new CreateOperation(path, data, createMode, cb);
-
-        zk.create(path, data, ZK_ACL, createMode, new 
CreateCallbackWrapper(op), null);
-    }
-
-    /**
-     *
-     */
-    public void close() {
-        closeClient();
-    }
-
-    /**
-     * @param e Error.
-     */
-    private void onZookeeperError(long prevConnStartTime, Exception e)
-        throws ZookeeperClientFailedException, InterruptedException
-    {
-        ZookeeperClientFailedException err = null;
-
-        synchronized (stateMux) {
-            U.warn(log, "Failed to execute zookeeper operation [err=" + e + ", 
state=" + state + ']');
-
-            if (zk.getState() == ZooKeeper.States.CLOSED)
-                throw new ZookeeperClientFailedException(e);
-
-            if (state == ConnectionState.Lost) {
-                U.error(log, "Operation failed with unexpected error, 
connection lost: " + e, e);
-
-                throw new ZookeeperClientFailedException(e);
-            }
-
-            boolean retry = (e instanceof KeeperException) && 
needRetry(((KeeperException)e).code().intValue());
-
-            if (retry) {
-                long remainingTime;
-
-                if (state == ConnectionState.Connected && connStartTime == 
prevConnStartTime) {
-                    state = ConnectionState.Disconnected;
-
-                    connStartTime = System.currentTimeMillis();
-
-                    remainingTime = connLossTimeout;
-                }
-                else {
-                    assert connStartTime != 0;
-
-                    assert state == ConnectionState.Disconnected;
-
-                    remainingTime = connLossTimeout - 
(System.currentTimeMillis() - connStartTime);
-
-                    if (remainingTime <= 0) {
-                        state = ConnectionState.Lost;
-
-                        U.warn(log, "Failed to establish zookeeper connection, 
close client " +
-                            "[timeout=" + connLossTimeout + ']');
-
-                        closeClient();
-
-                        err = new ZookeeperClientFailedException(e);
-                    }
-                }
-
-                if (err == null) {
-                    U.warn(log, "Zookeeper operation failed, will retry [err=" 
+ e +
-                        ", retryTimeout=" + RETRY_TIMEOUT +
-                        ", connLossTimeout=" + connLossTimeout +
-                        ", remainingWaitTime=" + remainingTime + ']');
-
-                    stateMux.wait(RETRY_TIMEOUT);
-                }
-            }
-            else {
-                U.error(log, "Operation failed with unexpected error, close 
client: " + e, e);
-
-                closeClient();
-
-                state = ConnectionState.Lost;
-
-                throw new ZookeeperClientFailedException(e);
-            }
-        }
-
-        if (err != null) {
-            notifyConnectionLost();
-
-            throw err;
-        }
-    }
-
-    /**
-     * @param code Zookeeper error code.
-     * @return {@code True} if can retry operation.
-     */
-    private boolean needRetry(int code) {
-        // TODO ZL: other codes.
-        return code == KeeperException.Code.CONNECTIONLOSS.intValue();
-    }
-
-    /**
-     *
-     */
-    private void closeClient() {
-        try {
-            zk.close();
-        }
-        catch (Exception closeErr) {
-            U.warn(log, "Failed to close zookeeper client: " + closeErr, 
closeErr);
-        }
-
-        connTimer.cancel();
-    }
-
-    /**
-     *
-     */
-    private void scheduleConnectionCheck() {
-        assert state == ConnectionState.Disconnected : state;
-
-        connTimer.schedule(new ConnectionTimeoutTask(connStartTime), 
connLossTimeout);
-    }
-
-    /**
-     *
-     */
-    interface ZkAsyncOperation {
-        /**
-         *
-         */
-        void execute();
-    }
-
-    /**
-     *
-     */
-    class GetChildrenOperation implements ZkAsyncOperation {
-        /** */
-        private final String path;
-
-        /** */
-        private final Watcher watcher;
-
-        /** */
-        private final AsyncCallback.Children2Callback cb;
-
-        GetChildrenOperation(String path, Watcher watcher, 
AsyncCallback.Children2Callback cb) {
-            this.path = path;
-            this.watcher = watcher;
-            this.cb = cb;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void execute() {
-            getChildrenAsync(path, watcher, cb);
-        }
-    }
-
-    /**
-     *
-     */
-    class GetDataOperation implements ZkAsyncOperation {
-        /** */
-        private final String path;
-
-        /** */
-        private final Watcher watcher;
-
-        /** */
-        private final AsyncCallback.DataCallback cb;
-
-        /**
-         * @param path Path.
-         * @param watcher Watcher.
-         * @param cb Callback.
-         */
-        GetDataOperation(String path, Watcher watcher, 
AsyncCallback.DataCallback cb) {
-            this.path = path;
-            this.watcher = watcher;
-            this.cb = cb;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void execute() {
-            getDataAsync(path, watcher, cb);
-        }
-    }
-
-    /**
-     *
-     */
-    class ExistsOperation implements ZkAsyncOperation {
-        /** */
-        private final String path;
-
-        /** */
-        private final Watcher watcher;
-
-        /** */
-        private final AsyncCallback.StatCallback cb;
-
-        /**
-         * @param path Path.
-         * @param watcher Watcher.
-         * @param cb Callback.
-         */
-        ExistsOperation(String path, Watcher watcher, 
AsyncCallback.StatCallback cb) {
-            this.path = path;
-            this.watcher = watcher;
-            this.cb = cb;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void execute() {
-            existsAsync(path, watcher, cb);
-        }
-    }
-
-    /**
-     *
-     */
-    class CreateOperation implements ZkAsyncOperation {
-        /** */
-        private final String path;
-
-        /** */
-        private final byte[] data;
-
-        /** */
-        private final CreateMode createMode;
-
-        /** */
-        private final AsyncCallback.StringCallback cb;
-
-        CreateOperation(String path, byte[] data, CreateMode createMode, 
AsyncCallback.StringCallback cb) {
-            this.path = path;
-            this.data = data;
-            this.createMode = createMode;
-            this.cb = cb;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void execute() {
-            createAsync(path, data, createMode, cb);
-        }
-    }
-
-    /**
-     *
-     */
-    class CreateCallbackWrapper implements AsyncCallback.StringCallback {
-        /** */
-        final CreateOperation op;
-
-        /**
-         * @param op Operation.
-         */
-        CreateCallbackWrapper(CreateOperation op) {
-            this.op = op;
-        }
-
-        @Override public void processResult(int rc, String path, Object ctx, 
String name) {
-            if (rc == KeeperException.Code.NODEEXISTS.intValue())
-                return;
-
-            if (needRetry(rc)) {
-                U.warn(log, "Failed to execute async operation, connection 
lost. Will retry after connection restore [path=" + path + ']');
-
-                retryQ.add(op);
-            }
-            else if (rc == KeeperException.Code.SESSIONEXPIRED.intValue())
-                U.warn(log, "Failed to execute async operation, connection 
lost [path=" + path + ']');
-            else {
-                if (op.cb != null)
-                    op.cb.processResult(rc, path, ctx, name);
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    class ChildrenCallbackWrapper implements AsyncCallback.Children2Callback {
-        /** */
-        private final GetChildrenOperation op;
-
-        /**
-         * @param op Operation.
-         */
-        private ChildrenCallbackWrapper(GetChildrenOperation op) {
-            this.op = op;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void processResult(int rc, String path, Object ctx, 
List<String> children, Stat stat) {
-            if (needRetry(rc)) {
-                U.warn(log, "Failed to execute async operation, connection 
lost. Will retry after connection restore [path=" + path + ']');
-
-                retryQ.add(op);
-            }
-            else if (rc == KeeperException.Code.SESSIONEXPIRED.intValue())
-                U.warn(log, "Failed to execute async operation, connection 
lost [path=" + path + ']');
-            else
-                op.cb.processResult(rc, path, ctx, children, stat);
-        }
-    }
-
-    /**
-     *
-     */
-    class DataCallbackWrapper implements AsyncCallback.DataCallback {
-        /** */
-        private final GetDataOperation op;
-
-        /**
-         * @param op Operation.
-         */
-        private DataCallbackWrapper(GetDataOperation op) {
-            this.op = op;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void processResult(int rc, String path, Object ctx, 
byte[] data, Stat stat) {
-            if (needRetry(rc)) {
-                U.warn(log, "Failed to execute async operation, connection 
lost. Will retry after connection restore [path=" + path + ']');
-
-                retryQ.add(op);
-            }
-            else if (rc == KeeperException.Code.SESSIONEXPIRED.intValue())
-                U.warn(log, "Failed to execute async operation, connection 
lost [path=" + path + ']');
-            else
-                op.cb.processResult(rc, path, ctx, data, stat);
-        }
-    }
-
-    /**
-     *
-     */
-    class StatCallbackWrapper implements AsyncCallback.StatCallback {
-        /** */
-        private final ExistsOperation op;
-
-        /**
-         * @param op Operation.
-         */
-        private StatCallbackWrapper(ExistsOperation op) {
-            this.op = op;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void processResult(int rc, String path, Object ctx, 
Stat stat) {
-            if (needRetry(rc)) {
-                U.warn(log, "Failed to execute async operation, connection 
lost. Will retry after connection restore [path=" + path + ']');
-
-                retryQ.add(op);
-            }
-            else if (rc == KeeperException.Code.SESSIONEXPIRED.intValue())
-                U.warn(log, "Failed to execute async operation, connection 
lost [path=" + path + ']');
-            else
-                op.cb.processResult(rc, path, ctx, stat);
-        }
-    }
-
-    /**
-     *
-     */
-    private class ConnectionTimeoutTask extends TimerTask {
-        /** */
-        private final long connectStartTime;
-
-        /**
-         * @param connectStartTime Time was connection started.
-         */
-        ConnectionTimeoutTask(long connectStartTime) {
-            this.connectStartTime = connectStartTime;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void run() {
-            boolean connLoss = false;
-
-            synchronized (stateMux) {
-                if (state == ConnectionState.Disconnected &&
-                    ZookeeperClient.this.connStartTime == connectStartTime) {
-
-                    state = ConnectionState.Lost;
-
-                    U.warn(log, "Failed to establish zookeeper connection, 
close client " +
-                        "[timeout=" + connLossTimeout + ']');
-
-                    connLoss = true;
-
-                    closeClient();
-                }
-            }
-
-            if (connLoss)
-                notifyConnectionLost();
-        }
-    }
-
-    /**
-     *
-     */
-    private enum ConnectionState {
-        /** */
-        Connected,
-        /** */
-        Disconnected,
-        /** */
-        Lost
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/42bbed0a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientFailedException.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientFailedException.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientFailedException.java
deleted file mode 100644
index 75a577c..0000000
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClientFailedException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.zk.internal;
-
-/**
- *
- */
-public class ZookeeperClientFailedException extends Exception {
-    /**
-     * @param cause Cause.
-     */
-    public ZookeeperClientFailedException(Throwable cause) {
-        super(cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/42bbed0a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java
----------------------------------------------------------------------
diff --git 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java
 
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java
deleted file mode 100644
index dc35752..0000000
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperClusterNode.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.zk.internal;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import org.apache.ignite.cluster.ClusterMetrics;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.internal.ClusterMetricsSnapshot;
-import org.apache.ignite.internal.IgniteNodeAttributes;
-import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.lang.IgniteProductVersion;
-import org.jetbrains.annotations.Nullable;
-
-import static 
org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTENT_ID;
-
-/**
- *
- */
-public class ZookeeperClusterNode implements ClusterNode, Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** */
-    private UUID id;
-
-    /** */
-    private Serializable consistentId;
-
-    /** */
-    private int internalId;
-
-    /** */
-    private long order;
-
-    /** */
-    private IgniteProductVersion ver;
-
-    /** Node attributes. */
-    @GridToStringExclude
-    private Map<String, Object> attrs;
-
-    /** */
-    private transient boolean loc;
-
-    /** TODO ZK */
-    private transient ClusterMetrics metrics;
-
-    /** */
-    private boolean client;
-
-    /**
-     * @param id Node ID.
-     * @param ver Node version.
-     * @param attrs Node attributes.
-     * @param consistentId Consistent ID.
-     * @param client Client node flag.
-     */
-    public ZookeeperClusterNode(UUID id,
-        IgniteProductVersion ver,
-        Map<String, Object> attrs,
-        Serializable consistentId,
-        boolean client) {
-        assert id != null;
-        assert consistentId != null;
-
-        this.id = id;
-        this.ver = ver;
-        this.attrs = U.sealMap(attrs);
-        this.consistentId = consistentId;
-        this.client = client;
-    }
-
-    /** {@inheritDoc} */
-    @Override public UUID id() {
-        return id;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Object consistentId() {
-        return consistentId;
-    }
-
-    /**
-     * Sets consistent globally unique node ID which survives node restarts.
-     *
-     * @param consistentId Consistent globally unique node ID.
-     */
-    public void setConsistentId(Serializable consistentId) {
-        this.consistentId = consistentId;
-
-        final Map<String, Object> map = new HashMap<>(attrs);
-
-        map.put(ATTR_NODE_CONSISTENT_ID, consistentId);
-
-        attrs = Collections.unmodifiableMap(map);
-    }
-
-    /** {@inheritDoc} */
-    @Nullable @Override public <T> T attribute(String name) {
-        // Even though discovery SPI removes this attribute after 
authentication, keep this check for safety.
-        if (IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(name))
-            return null;
-
-        return (T)attrs.get(name);
-    }
-
-    /** {@inheritDoc} */
-    @Override public ClusterMetrics metrics() {
-        if (metrics == null)
-            metrics = new ClusterMetricsSnapshot();
-
-        return metrics;
-    }
-
-    /** {@inheritDoc} */
-    @Override public Map<String, Object> attributes() {
-        // Even though discovery SPI removes this attribute after 
authentication, keep this check for safety.
-        return F.view(attrs, new IgnitePredicate<String>() {
-            @Override public boolean apply(String s) {
-                return 
!IgniteNodeAttributes.ATTR_SECURITY_CREDENTIALS.equals(s);
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override public Collection<String> addresses() {
-        return Collections.emptyList();
-    }
-
-    /** {@inheritDoc} */
-    @Override public Collection<String> hostNames() {
-        return Collections.emptyList();
-    }
-
-    /** {@inheritDoc} */
-    @Override public long order() {
-        return order;
-    }
-
-    /**
-     * @return Internal ID corresponds to Zookeeper sequential node.
-     */
-    public int internalId() {
-        return internalId;
-    }
-
-    /**
-     * @param internalId Internal ID corresponds to Zookeeper sequential node.
-     */
-    void internalId(int internalId) {
-        this.internalId = internalId;
-    }
-
-    void order(long order) {
-        assert order > 0 : order;
-
-        this.order = order;
-    }
-
-    /** {@inheritDoc} */
-    @Override public IgniteProductVersion version() {
-        return ver;
-    }
-
-    /**
-     * @param loc Local node flag.
-     */
-    public void local(boolean loc) {
-        this.loc = loc;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isLocal() {
-        return loc;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isDaemon() {
-        return false;
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean isClient() {
-        return client;
-    }
-
-    /** {@inheritDoc} */
-    @Override public int hashCode() {
-        return id.hashCode();
-    }
-
-    /** {@inheritDoc} */
-    @Override public boolean equals(Object obj) {
-        return F.eqNodes(this, obj);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return "ZookeeperClusterNode [id=" + id + ", order=" + order + ", 
client=" + client + ']';
-    }
-}

http://git-wip-us.apache.org/repos/asf/ignite/blob/42bbed0a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 1be4017..0000000
--- 
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java
+++ /dev/null
@@ -1,1455 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.spi.discovery.zk.internal;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.CountDownLatch;
-import org.apache.curator.utils.PathUtils;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteInterruptedException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.IgniteSystemProperties;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
-import org.apache.ignite.internal.events.DiscoveryCustomEvent;
-import org.apache.ignite.internal.util.future.GridFutureAdapter;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteRunnable;
-import org.apache.ignite.marshaller.jdk.JdkMarshaller;
-import org.apache.ignite.spi.IgniteSpiException;
-import org.apache.ignite.spi.discovery.DiscoveryDataBag;
-import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
-import org.apache.ignite.spi.discovery.DiscoverySpiDataExchange;
-import org.apache.ignite.spi.discovery.DiscoverySpiListener;
-import org.apache.zookeeper.AsyncCallback;
-import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.data.Stat;
-import org.jetbrains.annotations.Nullable;
-
-import static org.apache.zookeeper.CreateMode.EPHEMERAL_SEQUENTIAL;
-import static org.apache.zookeeper.CreateMode.PERSISTENT;
-
-/**
- * TODO ZK: check if compression makes sense.
- */
-public class ZookeeperDiscoveryImpl {
-    /** */
-    static final String IGNITE_ZOOKEEPER_DISCOVERY_SPI_ACK_THRESHOLD = 
"IGNITE_ZOOKEEPER_DISCOVERY_SPI_ACK_THRESHOLD";
-
-    /** */
-    private final JdkMarshaller marsh = new JdkMarshaller();
-
-    /** */
-    private final ZkIgnitePaths zkPaths;
-
-    /** */
-    private final IgniteLogger log;
-
-    /** */
-    private final ZookeeperClusterNode locNode;
-
-    /** */
-    private final DiscoverySpiListener lsnr;
-
-    /** */
-    private final DiscoverySpiDataExchange exchange;
-
-    /** */
-    private ZookeeperClient zkClient;
-
-    /** */
-    private final GridFutureAdapter<Void> joinFut = new GridFutureAdapter<>();
-
-    /** */
-    private final ZkWatcher watcher;
-
-    /** */
-    private final ZKChildrenCallback childrenCallback;
-
-    /** */
-    private final ZkDataCallback dataCallback;
-
-    /** */
-    private final ZkClusterNodes top = new ZkClusterNodes();
-
-    /** */
-    private long gridStartTime;
-
-    /** */
-    private boolean joined;
-
-    /** */
-    private ZkDiscoveryEventsData evtsData;
-
-    /** */
-    private boolean crd;
-
-    /** */
-    private String locNodeZkPath;
-
-    /** */
-    private ZkAliveNodeData locNodeInfo = new ZkAliveNodeData();
-
-    /** */
-    private final int evtsAckThreshold;
-
-    /**
-     * @param log Logger.
-     * @param basePath Zookeeper base path node all nodes.
-     * @param clusterName Cluster name (
-     * @param locNode Local node instance.
-     * @param lsnr Discovery events listener.
-     * @param exchange Discovery data exchange.
-     */
-    public ZookeeperDiscoveryImpl(IgniteLogger log,
-        String basePath,
-        String clusterName,
-        ZookeeperClusterNode locNode,
-        DiscoverySpiListener lsnr,
-        DiscoverySpiDataExchange exchange) {
-        assert locNode.id() != null && locNode.isLocal() : locNode;
-
-        if (F.isEmpty(clusterName))
-            throw new IllegalArgumentException("Cluster name is empty.");
-
-        PathUtils.validatePath(basePath);
-
-        zkPaths = new ZkIgnitePaths(basePath, clusterName);
-
-        this.log = log.getLogger(getClass());
-        this.locNode = locNode;
-        this.lsnr = lsnr;
-        this.exchange = exchange;
-
-        watcher = new ZkWatcher();
-        childrenCallback = new ZKChildrenCallback();
-        dataCallback = new ZkDataCallback();
-
-        int evtsAckThreshold = 
IgniteSystemProperties.getInteger(IGNITE_ZOOKEEPER_DISCOVERY_SPI_ACK_THRESHOLD, 
5);
-
-        if (evtsAckThreshold <= 0)
-            evtsAckThreshold = 1;
-
-        this.evtsAckThreshold = evtsAckThreshold;
-    }
-
-    /**
-     * @return Logger.
-     */
-    IgniteLogger log() {
-        return log;
-    }
-
-    /**
-     * @return Local node instance.
-     */
-    public ClusterNode localNode() {
-        return locNode;
-    }
-
-    /**
-     * @param nodeId Node ID.
-     * @return Node instance.
-     */
-    @Nullable public ClusterNode node(UUID nodeId) {
-        assert nodeId != null;
-
-        return top.nodesById.get(nodeId);
-    }
-
-    /**
-     * @param nodeId Node ID.
-     * @return Ping result.
-     */
-    public boolean pingNode(UUID nodeId) {
-        // TODO ZK
-        return node(nodeId) != null;
-    }
-
-    /**
-     * @return Remote nodes.
-     */
-    public Collection<ClusterNode> remoteNodes() {
-        return top.remoteNodes();
-    }
-
-    /**
-     * @param nodeId Node ID.
-     * @return {@code True} if node joined or joining topology.
-     */
-    public boolean knownNode(UUID nodeId) {
-        try {
-            List<String> children = 
zkClient.getChildren(zkPaths.aliveNodesDir);
-
-            for (int i = 0; i < children.size(); i++) {
-                UUID id = ZkIgnitePaths.aliveNodeId(children.get(i));
-
-                if (nodeId.equals(id))
-                    return true;
-            }
-
-            return false;
-        }
-        catch (ZookeeperClientFailedException e) {
-            throw new IgniteException(e);
-        }
-        catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-
-            throw new IgniteInterruptedException(e);
-        }
-    }
-
-    /**
-     * @param msg Message.
-     */
-    public void sendCustomMessage(DiscoverySpiCustomMessage msg) {
-        assert msg != null;
-
-        byte[] msgBytes;
-
-        try {
-            msgBytes = marshal(msg);
-        }
-        catch (IgniteCheckedException e) {
-            throw new IgniteSpiException("Failed to marshal custom message: " 
+ msg, e);
-        }
-
-        try {
-            // TODO ZK: handle retries.
-            zkClient.createIfNeeded(zkPaths.customEvtsDir + "/" + locNode.id() 
+ '|', msgBytes, CreateMode.PERSISTENT_SEQUENTIAL);
-        }
-        catch (ZookeeperClientFailedException e) {
-            throw new IgniteException(e);
-        }
-        catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-
-            throw new IgniteInterruptedException(e);
-        }
-    }
-
-    /**
-     * @return Cluster start time.
-     */
-    public long gridStartTime() {
-        return gridStartTime;
-    }
-
-    /**
-     * @param igniteInstanceName Ignite instance name.
-     * @param connectString Zookeeper connect string.
-     * @param sesTimeout Zookeeper session timeout.
-     * @throws InterruptedException If interrupted.
-     */
-    public void joinTopology(String igniteInstanceName, String connectString, 
int sesTimeout)
-        throws InterruptedException
-    {
-        DiscoveryDataBag discoDataBag = new DiscoveryDataBag(locNode.id());
-
-        exchange.collect(discoDataBag);
-
-        ZkJoiningNodeData joinData = new ZkJoiningNodeData(locNode, 
discoDataBag.joiningNodeData());
-
-        byte[] joinDataBytes;
-
-        try {
-            joinDataBytes = marshal(joinData);
-        }
-        catch (Exception e) {
-            throw new IgniteSpiException("Failed to marshal joining node 
data", e);
-        }
-
-        try {
-            zkClient = new ZookeeperClient(igniteInstanceName,
-                log,
-                connectString,
-                sesTimeout,
-                new ConnectionLossListener());
-        }
-        catch (Exception e) {
-            throw new IgniteSpiException("Failed to create Zookeeper client", 
e);
-        }
-
-        initZkNodes();
-
-        startJoin(joinDataBytes);
-
-        for (;;) {
-            try {
-                joinFut.get(10_000);
-
-                break;
-            }
-            catch (IgniteFutureTimeoutCheckedException e) {
-                U.warn(log, "Waiting for local join event [nodeId=" + 
locNode.id() + ", name=" + igniteInstanceName + ']');
-            }
-            catch (Exception e) {
-                throw new IgniteSpiException("Failed to join cluster", e);
-            }
-        }
-    }
-
-    /**
-     * @throws InterruptedException If interrupted.
-     */
-    private void initZkNodes() throws InterruptedException {
-        try {
-            // TODO ZK: use multi.
-            if (zkClient.exists(zkPaths.aliveNodesDir))
-                return; // This path is created last, assume all others dirs 
are created.
-
-            List<String> dirs = new ArrayList<>();
-
-            dirs.add(zkPaths.basePath);
-            dirs.add(zkPaths.clusterDir);
-            dirs.add(zkPaths.evtsPath);
-            dirs.add(zkPaths.joinDataDir);
-            dirs.add(zkPaths.customEvtsDir);
-            dirs.add(zkPaths.customEvtsAcksDir);
-            dirs.add(zkPaths.aliveNodesDir);
-
-            zkClient.createAllIfNeeded(dirs, PERSISTENT);
-        }
-        catch (ZookeeperClientFailedException e) {
-            throw new IgniteSpiException("Failed to initialize Zookeeper 
nodes", e);
-        }
-    }
-
-    /**
-     * @param joinDataBytes Joining node data.
-     * @throws InterruptedException If interrupted.
-     */
-    private void startJoin(byte[] joinDataBytes) throws InterruptedException {
-        try {
-            // TODO ZK: handle max size.
-            // TODO ZK: handle retries.
-            String path = zkClient.createIfNeeded(zkPaths.joinDataDir + "/" + 
locNode.id() + "|",
-                joinDataBytes,
-                EPHEMERAL_SEQUENTIAL);
-
-            int seqNum = Integer.parseInt(path.substring(path.lastIndexOf('|') 
+ 1));
-
-            locNodeZkPath = zkClient.createIfNeeded(zkPaths.aliveNodesDir + 
"/" + locNode.id() + "|" + seqNum + "|",
-                null,
-                EPHEMERAL_SEQUENTIAL);
-
-            zkClient.getChildrenAsync(zkPaths.aliveNodesDir, null, new 
AsyncCallback.Children2Callback() {
-                @Override public void processResult(int rc, String path, 
Object ctx, List<String> children, Stat stat) {
-                    onConnected(rc, children);
-                }
-            });
-
-            zkClient.getDataAsync(zkPaths.evtsPath, watcher, dataCallback);
-
-            connStartLatch.countDown();
-        }
-        catch (ZookeeperClientFailedException e) {
-            throw new IgniteSpiException("Failed to initialize Zookeeper 
nodes", e);
-        }
-    }
-
-    /** TODO ZK */
-    private final CountDownLatch connStartLatch = new CountDownLatch(1);
-
-    /**
-     * For testing only.
-     *
-     * @throws Exception If failed.
-     */
-    void waitConnectStart() throws Exception {
-        connStartLatch.await();
-    }
-
-    /**
-     * @param rc Async callback result.
-     * @param aliveNodes Alive nodes.
-     */
-    private void onConnected(int rc, List<String> aliveNodes) {
-        assert !joined;
-
-        checkIsCoordinator(rc, aliveNodes);
-    }
-
-    /**
-     * @param rc Callback result code.
-     * @param aliveNodes Alive nodes.
-     */
-    private void checkIsCoordinator(int rc, final List<String> aliveNodes) {
-        try {
-            assert rc == 0 : rc;
-
-            TreeMap<Integer, String> alives = new TreeMap<>();
-
-            Integer locInternalId = null;
-
-            for (String aliveNodePath : aliveNodes) {
-                Integer internalId = 
ZkIgnitePaths.aliveInternalId(aliveNodePath);
-
-                alives.put(internalId, aliveNodePath);
-
-                if (locInternalId == null) {
-                    UUID nodeId = ZkIgnitePaths.aliveNodeId(aliveNodePath);
-
-                    if (locNode.id().equals(nodeId))
-                        locInternalId = internalId;
-                }
-            }
-
-            assert !alives.isEmpty();
-            assert locInternalId != null;
-
-            Map.Entry<Integer, String> crdE = alives.firstEntry();
-
-            if (locInternalId.equals(crdE.getKey()))
-                onBecomeCoordinator(aliveNodes, locInternalId);
-            else {
-                assert alives.size() > 1;
-
-                Map.Entry<Integer, String> prevE = 
alives.floorEntry(locInternalId - 1);
-
-                assert prevE != null;
-
-                final int crdInternalId = crdE.getKey();
-                final int locInternalId0 = locInternalId;
-
-                log.info("Discovery coordinator already exists, watch for 
previous node [" +
-                    "locId=" + locNode.id() +
-                    ", prevPath=" + prevE.getValue() + ']');
-
-                zkClient.existsAsync(zkPaths.aliveNodesDir + "/" + 
prevE.getValue(), new Watcher() {
-                    @Override public void process(WatchedEvent evt) {
-                        if (evt.getType() == Event.EventType.NodeDeleted) {
-                            try {
-                                onPreviousNodeFail(aliveNodes, crdInternalId, 
locInternalId0);
-                            }
-                            catch (Throwable e) {
-                                onFatalError(e);
-                            }
-                        }
-                    }
-                }, new AsyncCallback.StatCallback() {
-                    @Override public void processResult(int rc, String path, 
Object ctx, Stat stat) {
-                        assert rc == 0 : rc;
-
-                        if (stat == null) {
-                            try {
-                                onPreviousNodeFail(aliveNodes, crdInternalId, 
locInternalId0);
-                            }
-                            catch (Throwable e) {
-                                onFatalError(e);
-                            }
-                        }
-                    }
-                });
-            }
-        }
-        catch (Throwable e) {
-            onFatalError(e);
-        }
-    }
-
-    private void onPreviousNodeFail(List<String> aliveNodes, int 
crdInternalId, int locInternalId) throws Exception {
-        // TODO ZK:
-//        if (locInternalId == crdInternalId + 1) {
-//            if (log.isInfoEnabled())
-//                log.info("Previous discovery coordinator failed [locId=" + 
locNode.id() + ']');
-//
-//            onBecomeCoordinator(aliveNodes, locInternalId);
-//        }
-        if (log.isInfoEnabled())
-            log.info("Previous node failed, check is node new coordinator 
[locId=" + locNode.id() + ']');
-
-        zkClient.getChildrenAsync(zkPaths.aliveNodesDir, null, new 
AsyncCallback.Children2Callback() {
-            @Override public void processResult(int rc, String path, Object 
ctx, List<String> children, Stat stat) {
-                checkIsCoordinator(rc, children);
-            }
-        });
-    }
-
-    /**
-     * @param aliveNodes Alive nodes paths.
-     * @param locInternalId Local node's internal ID.
-     * @throws Exception If failed.
-     */
-    private void onBecomeCoordinator(List<String> aliveNodes, int 
locInternalId) throws Exception {
-        byte[] evtsDataBytes = zkClient.getData(zkPaths.evtsPath);
-
-        if (evtsDataBytes.length > 0)
-            processNewEvents(evtsDataBytes);
-
-        crd = true;
-
-        if (joined) {
-            if (log.isInfoEnabled())
-                log.info("Node is new discovery coordinator [locId=" + 
locNode.id() + ']');
-
-            assert locNode.order() > 0 : locNode;
-            assert this.evtsData != null;
-
-            for (ZkDiscoveryEventData evtData : evtsData.evts.values())
-                evtData.remainingAcks(top.nodesByOrder.values());
-
-            handleProcessedEvents();
-        }
-        else {
-            if (log.isInfoEnabled())
-                log.info("Node is first cluster node [locId=" + locNode.id() + 
']');
-
-            newClusterStarted(locInternalId);
-        }
-
-        zkClient.getChildrenAsync(zkPaths.aliveNodesDir, watcher, 
childrenCallback);
-        zkClient.getChildrenAsync(zkPaths.customEvtsDir, watcher, 
childrenCallback);
-
-        for (String alivePath : aliveNodes)
-            watchAliveNodeData(alivePath);
-    }
-
-    /**
-     * @param alivePath
-     */
-    private void watchAliveNodeData(String alivePath) {
-        assert locNodeZkPath != null;
-
-        String path = zkPaths.aliveNodesDir + "/" + alivePath;
-
-        if (!path.equals(locNodeZkPath))
-            zkClient.getDataAsync(path, aliveNodeDataWatcher, 
aliveNodeDataUpdateCallback);
-    }
-
-    /** */
-    private final AliveNodeDataWatcher aliveNodeDataWatcher = new 
AliveNodeDataWatcher();
-
-    /** */
-    private AliveNodeDataUpdateCallback aliveNodeDataUpdateCallback = new 
AliveNodeDataUpdateCallback();
-
-    /**
-     *
-     */
-    private class AliveNodeDataWatcher implements Watcher {
-        @Override public void process(WatchedEvent evt) {
-            if (evt.getType() == Event.EventType.NodeDataChanged) {
-                zkClient.getDataAsync(evt.getPath(), this, 
aliveNodeDataUpdateCallback);
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private class AliveNodeDataUpdateCallback implements 
AsyncCallback.DataCallback {
-        @Override public void processResult(int rc, String path, Object ctx, 
byte[] data, Stat stat) {
-            assert crd;
-
-            if (rc == KeeperException.Code.NONODE.intValue()) {
-                if (log.isDebugEnabled())
-                    log.debug("Alive node callaback, no node: " + path);
-
-                return;
-            }
-
-            assert rc == 0 : rc;
-
-            try {
-                if (data.length > 0) {
-                    ZkAliveNodeData nodeData = unmarshal(data);
-
-                    Integer nodeInternalId = 
ZkIgnitePaths.aliveInternalId(path);
-
-                    Iterator<ZkDiscoveryEventData> it = 
evtsData.evts.values().iterator();
-
-                    boolean processed = false;
-
-                    while (it.hasNext()) {
-                        ZkDiscoveryEventData evtData = it.next();
-
-                        if (evtData.onAckReceived(nodeInternalId, 
nodeData.lastProcEvt))
-                            processed = true;
-                    }
-
-                    if (processed)
-                        handleProcessedEvents();
-                }
-            }
-            catch (Throwable e) {
-                onFatalError(e);
-            }
-        }
-    }
-
-    /**
-     * @param aliveNodes ZK nodes representing alive cluster nodes.
-     * @throws Exception If failed.
-     */
-    private void generateTopologyEvents(List<String> aliveNodes) throws 
Exception {
-        assert crd;
-
-        if (log.isInfoEnabled())
-            log.info("Process alive nodes change: " + aliveNodes);
-
-        TreeMap<Integer, String> alives = new TreeMap<>();
-
-        TreeMap<Long, ZookeeperClusterNode> curTop = new 
TreeMap<>(top.nodesByOrder);
-
-        boolean newEvts = false;
-
-        for (String child : aliveNodes) {
-            Integer inernalId = ZkIgnitePaths.aliveInternalId(child);
-
-            Object old = alives.put(inernalId, child);
-
-            assert old == null;
-
-            if (!top.nodesByInternalId.containsKey(inernalId)) {
-                generateNodeJoin(curTop, inernalId, child);
-
-                watchAliveNodeData(child);
-
-                newEvts = true;
-            }
-        }
-
-        for (Map.Entry<Integer, ZookeeperClusterNode> e : 
top.nodesByInternalId.entrySet()) {
-            if (!alives.containsKey(e.getKey())) {
-                ZookeeperClusterNode failedNode = e.getValue();
-
-                processEventAcksOnNodeFail(failedNode);
-
-                generateNodeFail(curTop, failedNode);
-
-                newEvts = true;
-            }
-        }
-
-        if (newEvts)
-            saveAndProcessNewEvents();
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    private void saveAndProcessNewEvents() throws Exception {
-        long start = System.currentTimeMillis();
-
-        zkClient.setData(zkPaths.evtsPath, marsh.marshal(evtsData), -1);
-
-        long time = System.currentTimeMillis() - start;
-
-        if (log.isInfoEnabled())
-            log.info("Discovery coordinator saved new topology events 
[topVer=" + evtsData.topVer + ", saveTime=" + time + ']');
-
-        processNewEvents(evtsData);
-    }
-
-    /**
-     * @param curTop Current topology.
-     * @param failedNode Failed node.
-     */
-    private void generateNodeFail(TreeMap<Long, ZookeeperClusterNode> curTop, 
ZookeeperClusterNode failedNode) {
-        Object rmvd = curTop.remove(failedNode.order());
-
-        assert rmvd != null;
-
-        evtsData.topVer++;
-        evtsData.evtIdGen++;
-
-        ZkDiscoveryNodeFailEventData evtData = new 
ZkDiscoveryNodeFailEventData(
-            evtsData.evtIdGen,
-            evtsData.topVer,
-            failedNode.internalId());
-
-        evtsData.addEvent(curTop.values(), evtData);
-
-        if (log.isInfoEnabled()) {
-            log.info("Generated NODE_FAILED event [topVer=" + 
evtData.topologyVersion() +
-                ", nodeId=" + failedNode.id() + ']');
-        }
-    }
-
-    /**
-     * @param curTop Current nodes.
-     * @param internalId Joined node internal ID.
-     * @param aliveNodePath Joined node path.
-     * @throws Exception If failed.
-     */
-    private void generateNodeJoin(TreeMap<Long, ZookeeperClusterNode> curTop,
-        int internalId,
-        String aliveNodePath)
-        throws Exception
-    {
-        UUID nodeId = ZkIgnitePaths.aliveNodeId(aliveNodePath);
-        int joinSeq = ZkIgnitePaths.aliveJoinSequence(aliveNodePath);
-
-        String joinDataPath = zkPaths.joinDataDir + '/' + nodeId.toString() + 
"|" + String.format("%010d", joinSeq);
-
-        byte[] joinData;
-
-        try {
-            joinData = zkClient.getData(joinDataPath);
-        }
-        catch (KeeperException.NoNodeException e) {
-            U.warn(log, "Failed to read joining node data, node left before 
join process finished: " + nodeId);
-
-            return;
-        }
-
-        // TODO ZK: fail node if can not unmarshal.
-        ZkJoiningNodeData joiningNodeData = unmarshal(joinData);
-
-        ZookeeperClusterNode joinedNode = joiningNodeData.node();
-
-        assert nodeId.equals(joinedNode.id()) : joiningNodeData.node();
-
-        evtsData.topVer++;
-        evtsData.evtIdGen++;
-
-        joinedNode.order(evtsData.topVer);
-        joinedNode.internalId(internalId);
-
-        DiscoveryDataBag joiningNodeBag = new DiscoveryDataBag(nodeId);
-
-        joiningNodeBag.joiningNodeData(joiningNodeData.discoveryData());
-
-        exchange.onExchange(joiningNodeBag);
-
-        DiscoveryDataBag collectBag = new DiscoveryDataBag(nodeId, new 
HashSet<Integer>());
-
-        exchange.collect(collectBag);
-
-        Map<Integer, Serializable> commonData = collectBag.commonData();
-
-        ZkJoinEventDataForJoined dataForJoined = new ZkJoinEventDataForJoined(
-            new ArrayList<>(curTop.values()),
-            commonData);
-
-        Object old = curTop.put(joinedNode.order(), joinedNode);
-
-        assert old == null;
-
-        ZkDiscoveryNodeJoinEventData evtData = new 
ZkDiscoveryNodeJoinEventData(
-            evtsData.evtIdGen,
-            evtsData.topVer,
-            joinedNode.id(),
-            joinedNode.internalId());
-
-        evtData.joiningNodeData = joiningNodeData;
-
-        evtsData.addEvent(dataForJoined.topology(), evtData);
-
-        long start = System.currentTimeMillis();
-
-        zkClient.createIfNeeded(zkPaths.joinEventDataPath(evtData.eventId()), 
joinData, PERSISTENT);
-        
zkClient.createIfNeeded(zkPaths.joinEventDataPathForJoined(evtData.eventId()), 
marshal(dataForJoined), PERSISTENT);
-
-        long time = System.currentTimeMillis() - start;
-
-        if (log.isInfoEnabled()) {
-            log.info("Generated NODE_JOINED event [topVer=" + 
evtData.topologyVersion() +
-                ", nodeId=" + joinedNode.id() +
-                ", addDataTime=" + time + ']');
-        }
-    }
-
-    /**
-     * @param locInternalId Local node internal ID.
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("unchecked")
-    private void newClusterStarted(int locInternalId) throws Exception {
-        cleanupPreviousClusterData();
-
-        joined = true;
-
-        gridStartTime = U.currentTimeMillis();
-
-        evtsData = new ZkDiscoveryEventsData(gridStartTime, 1L, new 
TreeMap<Long, ZkDiscoveryEventData>());
-
-        locNode.internalId(locInternalId);
-        locNode.order(1);
-
-        top.addNode(locNode);
-
-        lsnr.onDiscovery(EventType.EVT_NODE_JOINED,
-            1L,
-            locNode,
-            (Collection)top.nodesByOrder.values(),
-            Collections.<Long, Collection<ClusterNode>>emptyMap(),
-            null);
-
-        joinFut.onDone();
-
-        // TODO ZK: remove join zk nodes
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    private void cleanupPreviousClusterData() throws Exception {
-        // TODO ZK: use multi, better batching.
-        zkClient.setData(zkPaths.evtsPath, null, -1);
-
-        List<String> evtChildren = zkClient.getChildren(zkPaths.evtsPath);
-
-        for (String evtPath : evtChildren) {
-            String evtDir = zkPaths.evtsPath + "/" + evtPath;
-
-            removeChildren(evtDir);
-        }
-
-        zkClient.deleteAll(zkPaths.evtsPath, evtChildren, -1);
-
-        zkClient.deleteAll(zkPaths.customEvtsDir,
-            zkClient.getChildren(zkPaths.customEvtsDir),
-            -1);
-
-        zkClient.deleteAll(zkPaths.customEvtsAcksDir,
-            zkClient.getChildren(zkPaths.customEvtsDir),
-            -1);
-    }
-
-    /**
-     * @param path Path.
-     * @throws Exception If failed.
-     */
-    private void removeChildren(String path) throws Exception {
-        zkClient.deleteAll(path, zkClient.getChildren(path), -1);
-    }
-
-    ZkClusterNodes nodes() {
-        return top;
-    }
-
-    ZookeeperClient zkClient() {
-        return zkClient;
-    }
-
-    /**
-     * @param customEvtNodes ZK nodes representing custom events to process.
-     * @throws Exception If failed.
-     */
-    private void generateCustomEvents(List<String> customEvtNodes) throws 
Exception {
-        assert crd;
-
-        TreeMap<Integer, String> newEvts = null;
-
-        for (int i = 0; i < customEvtNodes.size(); i++) {
-            String evtPath = customEvtNodes.get(i);
-
-            int evtSeq = ZkIgnitePaths.customEventSequence(evtPath);
-
-            if (evtSeq > evtsData.procCustEvt) {
-                if (newEvts == null)
-                    newEvts = new TreeMap<>();
-
-                newEvts.put(evtSeq, evtPath);
-            }
-        }
-
-        if (newEvts != null) {
-            for (Map.Entry<Integer, String> evtE : newEvts.entrySet()) {
-                UUID sndNodeId = 
ZkIgnitePaths.customEventSendNodeId(evtE.getValue());
-
-                ZookeeperClusterNode sndNode = top.nodesById.get(sndNodeId);
-
-                String evtDataPath = zkPaths.customEvtsDir + "/" + 
evtE.getValue();
-
-                if (sndNode != null) {
-                    byte[] evtBytes = zkClient.getData(zkPaths.customEvtsDir + 
"/" + evtE.getValue());
-
-                    DiscoverySpiCustomMessage msg;
-
-                    try {
-                        msg = unmarshal(evtBytes);
-
-                        evtsData.evtIdGen++;
-
-                        ZkDiscoveryCustomEventData evtData = new 
ZkDiscoveryCustomEventData(
-                            evtsData.evtIdGen,
-                            evtsData.topVer,
-                            sndNodeId,
-                            evtE.getValue(),
-                            false);
-
-                        evtData.msg = msg;
-
-                        evtsData.addEvent(top.nodesByOrder.values(), evtData);
-
-                        if (log.isInfoEnabled())
-                            log.info("Generated CUSTOM event [topVer=" + 
evtData.topologyVersion() + ", evt=" + msg + ']');
-                    }
-                    catch (IgniteCheckedException e) {
-                        U.error(log, "Failed to unmarshal custom discovery 
message: " + e, e);
-                    }
-                }
-                else {
-                    U.warn(log, "Ignore custom event from unknown node: " + 
sndNodeId);
-
-                    zkClient.deleteIfExists(evtDataPath, -1);
-                }
-
-                evtsData.procCustEvt = evtE.getKey();
-            }
-
-            saveAndProcessNewEvents();
-        }
-    }
-
-    /**
-     * @param data Marshalled events.
-     * @throws Exception If failed.
-     */
-    private void processNewEvents(byte[] data) throws Exception {
-        if (data.length == 0)
-            return;
-
-        assert !crd;
-
-        ZkDiscoveryEventsData newEvtsData = unmarshal(data);
-
-        // Need keep processed custom events since they contains message 
object.
-        if (evtsData != null)
-            newEvtsData.evts.putAll(evtsData.evts);
-
-        processNewEvents(newEvtsData);
-
-        this.evtsData = newEvtsData;
-    }
-
-    /** */
-    private int procEvtCnt;
-
-    /**
-     * @param evtsData Events.
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("unchecked")
-    private void processNewEvents(ZkDiscoveryEventsData evtsData) throws 
Exception {
-        TreeMap<Long, ZkDiscoveryEventData> evts = evtsData.evts;
-
-        boolean updateNodeInfo = false;
-
-        for (ZkDiscoveryEventData evtData : 
evts.tailMap(locNodeInfo.lastProcEvt, false).values()) {
-            if (!joined) {
-                if (evtData.eventType() != EventType.EVT_NODE_JOINED)
-                    continue;
-
-                ZkDiscoveryNodeJoinEventData evtData0 = 
(ZkDiscoveryNodeJoinEventData)evtData;
-
-                UUID joinedId = evtData0.nodeId;
-
-                boolean locJoin = evtData.eventType() == 
EventType.EVT_NODE_JOINED &&
-                    locNode.id().equals(joinedId);
-
-                if (locJoin)
-                    processLocalJoin(evtsData, evtData0);
-            }
-            else {
-                if (log.isInfoEnabled())
-                    log.info("New discovery event data: " + evtData + ']');
-
-                switch (evtData.eventType()) {
-                    case EventType.EVT_NODE_JOINED: {
-                        ZkDiscoveryNodeJoinEventData evtData0 = 
(ZkDiscoveryNodeJoinEventData)evtData;
-
-                        ZkJoiningNodeData joiningData;
-
-                        if (crd) {
-                            assert evtData0.joiningNodeData != null;
-
-                            joiningData = evtData0.joiningNodeData;
-                        }
-                        else {
-                            String path = 
zkPaths.joinEventDataPath(evtData.eventId());
-
-                            joiningData = unmarshal(zkClient.getData(path));
-
-                            DiscoveryDataBag dataBag = new 
DiscoveryDataBag(evtData0.nodeId);
-
-                            
dataBag.joiningNodeData(joiningData.discoveryData());
-
-                            exchange.onExchange(dataBag);
-                        }
-
-                        notifyNodeJoin(evtData0, joiningData);
-
-                        break;
-                    }
-
-                    case EventType.EVT_NODE_FAILED: {
-                        notifyNodeFail((ZkDiscoveryNodeFailEventData)evtData);
-
-                        break;
-                    }
-
-                    case DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT: {
-                        ZkDiscoveryCustomEventData evtData0 = 
(ZkDiscoveryCustomEventData)evtData;
-
-                        if (evtData0.ackEvent() && evtData0.topologyVersion() 
< locNode.order())
-                            break;
-
-                        DiscoverySpiCustomMessage msg;
-
-                        if (crd) {
-                            assert evtData0.msg != null : evtData0;
-
-                            msg = evtData0.msg;
-                        }
-                        else {
-                            String path = 
zkPaths.customEventDataPath(evtData0.ackEvent(),
-                                evtData0.evtPath);
-
-                            msg = unmarshal(zkClient.getData(path));
-
-                            evtData0.msg = msg;
-                        }
-
-                        notifyCustomEvent(evtData0, msg);
-
-                        if (!evtData0.ackEvent())
-                            updateNodeInfo = true;
-
-                        break;
-                    }
-
-                    default:
-                        assert false : "Invalid event: " + evtData;
-                }
-            }
-
-            if (joined) {
-                locNodeInfo.lastProcEvt = evtData.eventId();
-
-                procEvtCnt++;
-
-                if (procEvtCnt % evtsAckThreshold == 0)
-                    updateNodeInfo = true;
-            }
-        }
-
-        if (crd) {
-            handleProcessedEvents();
-        }
-        else if (updateNodeInfo) {
-            assert locNodeZkPath != null;
-
-            zkClient.setData(locNodeZkPath, marshal(locNodeInfo), -1);
-        }
-    }
-
-    /**
-     * @throws Exception If failed.
-     */
-    private void handleProcessedEvents() throws Exception {
-        Iterator<ZkDiscoveryEventData> it = 
this.evtsData.evts.values().iterator();
-
-        List<ZkDiscoveryCustomEventData> newEvts = null;
-
-        while (it.hasNext()) {
-            ZkDiscoveryEventData evtData = it.next();
-
-            if (evtData.allAcksReceived()) {
-                switch (evtData.eventType()) {
-                    case EventType.EVT_NODE_JOINED: {
-                        
processNodesAckJoinEvent((ZkDiscoveryNodeJoinEventData)evtData);
-
-                        break;
-                    }
-
-                    case DiscoveryCustomEvent.EVT_DISCOVERY_CUSTOM_EVT: {
-                        DiscoverySpiCustomMessage ack = 
handleProcessedCustomEvent((ZkDiscoveryCustomEventData)evtData);
-
-                        if (ack != null) {
-                            evtsData.evtIdGen++;
-
-                            long evtId = evtsData.evtIdGen;
-
-                            byte[] ackBytes = marshal(ack);
-
-                            String evtChildPath = String.valueOf(evtId);
-
-                            zkClient.createIfNeeded(
-                                zkPaths.customEventDataPath(true, 
evtChildPath),
-                                ackBytes,
-                                CreateMode.PERSISTENT);
-
-                            ZkDiscoveryCustomEventData ackEvtData = new 
ZkDiscoveryCustomEventData(
-                                evtId,
-                                evtData.topologyVersion(), // Use topology 
version from original event.
-                                locNode.id(),
-                                evtChildPath,
-                                true);
-
-                            ackEvtData.msg = ack;
-
-                            if (newEvts == null)
-                                newEvts = new ArrayList<>();
-
-                            newEvts.add(ackEvtData);
-
-                            if (log.isInfoEnabled())
-                                log.info("Generated CUSTOM event [topVer=" + 
evtData.topologyVersion() + ", evt=" + ack + ']');
-                        }
-
-                        break;
-                    }
-
-                    case EventType.EVT_NODE_FAILED: {
-                        log.info("All nodes processed node fail [evtId=" + 
evtData.eventId() + ']');
-
-                        // Do not need cleanup.
-                        break;
-                    }
-                }
-
-                it.remove();
-            }
-        }
-
-        if (newEvts != null) {
-            for (int i = 0; i < newEvts.size(); i++)
-                evtsData.addEvent(top.nodesByOrder.values(), newEvts.get(i));
-
-            saveAndProcessNewEvents();
-        }
-    }
-
-    /**
-     * @param evtsData Events data.
-     * @param evtData Local join event data.
-     * @throws Exception If failed.
-     */
-    @SuppressWarnings("unchecked")
-    private void processLocalJoin(ZkDiscoveryEventsData evtsData, 
ZkDiscoveryNodeJoinEventData evtData)
-        throws Exception
-    {
-        if (log.isInfoEnabled())
-            log.info("Local join event data: " + evtData + ']');
-
-        String path = zkPaths.joinEventDataPathForJoined(evtData.eventId());
-
-        ZkJoinEventDataForJoined dataForJoined = 
unmarshal(zkClient.getData(path));
-
-        gridStartTime = evtsData.gridStartTime;
-
-        locNode.internalId(evtData.joinedInternalId);
-        locNode.order(evtData.topologyVersion());
-
-        DiscoveryDataBag dataBag = new DiscoveryDataBag(locNode.id());
-
-        dataBag.commonData(dataForJoined.discoveryData());
-
-        exchange.onExchange(dataBag);
-
-        List<ZookeeperClusterNode> allNodes = dataForJoined.topology();
-
-        for (ZookeeperClusterNode node : allNodes)
-            top.addNode(node);
-
-        top.addNode(locNode);
-
-        List<ClusterNode> topSnapshot = new 
ArrayList<>((Collection)top.nodesByOrder.values());
-
-        lsnr.onDiscovery(evtData.eventType(),
-            evtData.topologyVersion(),
-            locNode,
-            topSnapshot,
-            Collections.<Long, Collection<ClusterNode>>emptyMap(),
-            null);
-
-        joinFut.onDone();
-
-        joined = true;
-
-        // TODO ZK: async
-        zkClient.deleteIfExists(path, -1);
-    }
-
-    /**
-     * @param evtData Event data.
-     * @param msg Custom message.
-     */
-    @SuppressWarnings("unchecked")
-    private void notifyCustomEvent(ZkDiscoveryCustomEventData evtData, 
DiscoverySpiCustomMessage msg) {
-        if (log.isInfoEnabled())
-            log.info(" [topVer=" + evtData.topologyVersion() + ", msg=" + msg 
+ ']');
-
-        ZookeeperClusterNode sndNode = top.nodesById.get(evtData.sndNodeId);
-
-        assert sndNode != null : evtData;
-
-        List<ClusterNode> topSnapshot = new 
ArrayList<>((Collection)top.nodesByOrder.values());
-
-        lsnr.onDiscovery(evtData.eventType(),
-            evtData.topologyVersion(),
-            sndNode,
-            topSnapshot,
-            Collections.<Long, Collection<ClusterNode>>emptyMap(),
-            msg);
-    }
-
-    /**
-     * @param evtData Event data.
-     * @param joiningData Joining node data.
-     */
-    @SuppressWarnings("unchecked")
-    private void notifyNodeJoin(ZkDiscoveryNodeJoinEventData evtData, 
ZkJoiningNodeData joiningData) {
-        ZookeeperClusterNode joinedNode = joiningData.node();
-
-        joinedNode.order(evtData.topologyVersion());
-        joinedNode.internalId(evtData.joinedInternalId);
-
-        top.addNode(joinedNode);
-
-        List<ClusterNode> topSnapshot = new 
ArrayList<>((Collection)top.nodesByOrder.values());
-
-        lsnr.onDiscovery(evtData.eventType(),
-            evtData.topologyVersion(),
-            joinedNode,
-            topSnapshot,
-            Collections.<Long, Collection<ClusterNode>>emptyMap(),
-            null);
-    }
-
-    /**
-     * @param evtData Event data.
-     */
-    @SuppressWarnings("unchecked")
-    private void notifyNodeFail(ZkDiscoveryNodeFailEventData evtData) {
-        ZookeeperClusterNode failedNode = 
top.removeNode(evtData.failedNodeInternalId());
-
-        assert failedNode != null;
-
-        List<ClusterNode> topSnapshot = new 
ArrayList<>((Collection)top.nodesByOrder.values());
-
-        lsnr.onDiscovery(evtData.eventType(),
-            evtData.topologyVersion(),
-            failedNode,
-            topSnapshot,
-            Collections.<Long, Collection<ClusterNode>>emptyMap(),
-            null);
-    }
-
-    /**
-     * @param failedNode Failed node.
-     * @throws Exception If failed.
-     */
-    private void processEventAcksOnNodeFail(ZookeeperClusterNode failedNode) 
throws Exception {
-        boolean processed = false;
-
-        for (Iterator<Map.Entry<Long, ZkDiscoveryEventData>> it = 
evtsData.evts.entrySet().iterator(); it.hasNext();) {
-            Map.Entry<Long, ZkDiscoveryEventData> e = it.next();
-
-            ZkDiscoveryEventData evtData = e.getValue();
-
-            if (evtData.onNodeFail(failedNode))
-                processed = true;
-        }
-
-        if (processed)
-            handleProcessedEvents();
-    }
-
-    /**
-     * @param evtData Event data.
-     * @throws Exception If failed.
-     */
-    private void processNodesAckJoinEvent(ZkDiscoveryNodeJoinEventData 
evtData) throws Exception {
-        log.info("All nodes processed node join [evtId=" + evtData.eventId() + 
']');
-
-        zkClient.deleteIfExists(zkPaths.joinEventDataPath(evtData.eventId()), 
-1);
-        
zkClient.deleteIfExists(zkPaths.joinEventDataPathForJoined(evtData.eventId()), 
-1);
-    }
-
-    /**
-     * @param evtData Event data.
-     * @throws Exception If failed.
-     * @return Ack message.
-     */
-    @Nullable private DiscoverySpiCustomMessage 
handleProcessedCustomEvent(ZkDiscoveryCustomEventData evtData)
-        throws Exception
-    {
-        log.info("All nodes processed custom event [evtId=" + 
evtData.eventId() + ']');
-
-        if (!evtData.ackEvent()) {
-            zkClient.deleteIfExists(zkPaths.customEventDataPath(false, 
evtData.evtPath), -1);
-
-            assert evtData.msg != null || locNode.order() > 
evtData.topologyVersion() : evtData;
-
-            if (evtData.msg != null)
-                return evtData.msg.ackMessage();
-        }
-        else
-            zkClient.deleteIfExists(zkPaths.customEventDataPath(true, 
evtData.evtPath), -1);
-
-        return null;
-    }
-
-    /**
-     *
-     */
-    public void stop() {
-        if (zkClient != null)
-            zkClient.close();
-
-        joinFut.onDone(new IgniteSpiException("Node stopped"));
-    }
-
-    /**
-     * @param e Error.
-     */
-    private void onFatalError(Throwable e) {
-        // TODO ZK
-        U.error(log, "Failed to process discovery data. Stopping the node in 
order to prevent cluster wide instability.", e);
-
-        joinFut.onDone(e);
-
-        if (e instanceof Error)
-            throw (Error)e;
-    }
-
-    /**
-     * @param bytes Bytes.
-     * @return Unmarshalled object.
-     * @throws IgniteCheckedException If failed.
-     */
-    private <T> T unmarshal(byte[] bytes) throws IgniteCheckedException {
-        assert bytes != null && bytes.length > 0;
-
-        return marsh.unmarshal(bytes, null);
-    }
-
-    /**
-     * @param obj Object.
-     * @return Bytes.
-     * @throws IgniteCheckedException If failed.
-     */
-    private byte[] marshal(Object obj) throws IgniteCheckedException {
-        assert obj != null;
-
-        return marsh.marshal(obj);
-    }
-
-    /**
-     *
-     */
-    private class ConnectionLossListener implements IgniteRunnable {
-        /** {@inheritDoc} */
-        @Override public void run() {
-            // TODO ZK, can be called from any thread.
-            U.warn(log, "Zookeeper connection loss, local node is SEGMENTED");
-
-            if (joined) {
-                assert evtsData != null;
-
-                lsnr.onDiscovery(EventType.EVT_NODE_SEGMENTED,
-                    evtsData.topVer,
-                    locNode,
-                    Collections.<ClusterNode>emptyList(),
-                    Collections.<Long, Collection<ClusterNode>>emptyMap(),
-                    null);
-            }
-            else
-                joinFut.onDone(new IgniteSpiException("Local node SEGMENTED"));
-        }
-    }
-
-    /**
-     *
-     */
-    private class ZkWatcher implements Watcher {
-        /** {@inheritDoc} */
-        @Override public void process(WatchedEvent evt) {
-            if (evt.getType() == Event.EventType.NodeDataChanged) {
-                if (evt.getPath().equals(zkPaths.evtsPath)) {
-                    if (!crd)
-                        zkClient.getDataAsync(evt.getPath(), this, 
dataCallback);
-                }
-                else
-                    U.warn(log, "Received NodeDataChanged for unexpected path: 
" + evt.getPath());
-            }
-            else if (evt.getType() == Event.EventType.NodeChildrenChanged) {
-                if (evt.getPath().equals(zkPaths.aliveNodesDir))
-                    zkClient.getChildrenAsync(evt.getPath(), this, 
childrenCallback);
-                else if (evt.getPath().equals(zkPaths.customEvtsDir))
-                    zkClient.getChildrenAsync(evt.getPath(), this, 
childrenCallback);
-                else
-                    U.warn(log, "Received NodeChildrenChanged for unexpected 
path: " + evt.getPath());
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private class ZKChildrenCallback implements 
AsyncCallback.Children2Callback {
-        /** {@inheritDoc} */
-        @Override public void processResult(int rc, String path, Object ctx, 
List<String> children, Stat stat) {
-            try {
-                assert rc == 0 : rc;
-
-                if (path.equals(zkPaths.aliveNodesDir))
-                    generateTopologyEvents(children);
-                else if (path.equals(zkPaths.customEvtsDir))
-                    generateCustomEvents(children);
-                else
-                    U.warn(log, "Children callback for unexpected path: " + 
path);
-            }
-            catch (Throwable e) {
-                onFatalError(e);
-            }
-        }
-    }
-
-    /**
-     *
-     */
-    private class ZkDataCallback implements AsyncCallback.DataCallback {
-        /** {@inheritDoc} */
-        @Override public void processResult(int rc, String path, Object ctx, 
byte[] data, Stat stat) {
-            try {
-                assert rc == 0 : rc;
-
-                if (path.equals(zkPaths.evtsPath)) {
-                    if (!crd)
-                        processNewEvents(data);
-                }
-                else
-                    U.warn(log, "Data callback for unknown path: " + path);
-            }
-            catch (Throwable e) {
-                onFatalError(e);
-            }
-        }
-    }
-}

Reply via email to