ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [04/32] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 10:03:05 GMT
# Renaming


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1f7f61ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1f7f61ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1f7f61ed

Branch: refs/heads/master
Commit: 1f7f61edf9cf5ab0bc60d0d2debd4f86479261b3
Parents: 9731a02
Author: sboikov <sboikov@gridgain.com>
Authored: Fri Dec 5 12:36:43 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri Dec 5 12:36:43 2014 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCompute.java   |  2 +-
 .../java/org/apache/ignite/IgniteMessaging.java |  6 +--
 .../cluster/ClusterGroupEmptyException.java     | 47 +++++++++++++++++++
 .../cluster/ClusterTopologyException.java       | 41 +++++++++++++++++
 .../cluster/GridEmptyProjectionException.java   | 48 --------------------
 .../ignite/cluster/GridTopologyException.java   | 41 -----------------
 .../apache/ignite/compute/ComputeJobResult.java |  2 +-
 .../org/apache/ignite/compute/ComputeTask.java  |  4 +-
 .../ignite/compute/ComputeTaskAdapter.java      |  4 +-
 .../org/gridgain/grid/kernal/GridKernal.java    |  2 +-
 .../processors/cache/GridCacheAdapter.java      |  8 ++--
 .../cache/GridCacheEvictionManager.java         |  4 +-
 .../processors/cache/GridCacheIoManager.java    | 10 ++--
 .../processors/cache/GridCacheMvccManager.java  |  2 +-
 .../GridCachePartitionExchangeManager.java      |  2 +-
 .../processors/cache/GridCacheTxHandler.java    |  2 +-
 .../GridCacheDataStructuresManager.java         |  8 ++--
 .../GridTransactionalCacheQueueImpl.java        | 16 +++----
 ...ridCacheOptimisticCheckPreparedTxFuture.java |  4 +-
 ...dCachePessimisticCheckCommittedTxFuture.java |  6 +--
 .../dht/GridDhtAssignmentFetchFuture.java       |  2 +-
 .../distributed/dht/GridDhtLockFuture.java      | 10 ++--
 .../dht/GridDhtTransactionalCacheAdapter.java   |  6 +--
 .../distributed/dht/GridDhtTxFinishFuture.java  | 12 ++---
 .../cache/distributed/dht/GridDhtTxLocal.java   |  2 +-
 .../distributed/dht/GridDhtTxPrepareFuture.java |  8 ++--
 .../dht/GridPartitionedGetFuture.java           | 12 ++---
 .../dht/atomic/GridDhtAtomicCache.java          |  6 +--
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |  4 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  6 +--
 .../colocated/GridDhtColocatedLockFuture.java   | 12 ++---
 .../dht/preloader/GridDhtForceKeysFuture.java   |  8 ++--
 .../preloader/GridDhtPartitionDemandPool.java   |  4 +-
 .../preloader/GridDhtPartitionSupplyPool.java   |  2 +-
 .../GridDhtPartitionsExchangeFuture.java        |  2 +-
 .../dht/preloader/GridDhtPreloader.java         |  2 +-
 .../distributed/near/GridNearGetFuture.java     | 12 ++---
 .../distributed/near/GridNearLockFuture.java    | 12 ++---
 .../near/GridNearTxFinishFuture.java            |  6 +--
 .../near/GridNearTxPrepareFuture.java           |  6 +--
 .../query/GridCacheDistributedQueryManager.java |  2 +-
 .../GridCacheContinuousQueryAdapter.java        |  2 +-
 .../continuous/GridContinuousProcessor.java     | 18 ++++----
 .../dataload/IgniteDataLoaderImpl.java          |  8 ++--
 .../processors/ggfs/GridGgfsDataManager.java    |  2 +-
 .../ggfs/GridGgfsFragmentizerManager.java       | 10 ++--
 .../handlers/task/GridTaskCommandHandler.java   |  2 +-
 .../service/GridServiceProcessor.java           | 14 +++---
 .../processors/service/GridServiceProxy.java    |  2 +-
 .../GridStreamerStageExecutionFuture.java       |  2 +-
 .../processors/streamer/IgniteStreamerImpl.java |  6 +--
 .../kernal/processors/task/GridTaskWorker.java  | 14 +++---
 .../visor/node/VisorNodeDataCollectorTask.java  |  2 +-
 .../kernal/visor/node/VisorNodePingTask.java    |  4 +-
 .../java/org/gridgain/grid/util/GridUtils.java  |  4 +-
 .../grid/util/future/GridCompoundFuture.java    |  2 +-
 .../grid/kernal/ClusterMetricsSelfTest.java     |  2 +-
 .../grid/kernal/GridEventStorageSelfTest.java   |  2 +-
 .../GridFailoverTaskWithPredicateSelfTest.java  |  6 +--
 .../grid/kernal/GridTaskFailoverSelfTest.java   |  2 +-
 .../GridCacheAbstractFailoverSelfTest.java      |  8 ++--
 .../cache/GridCacheAbstractSelfTest.java        |  2 +-
 .../GridCacheAbstractNodeRestartSelfTest.java   |  8 ++--
 .../near/GridCacheNearOnlyTopologySelfTest.java |  6 +--
 ...ionedClientOnlyNoPrimaryFullApiSelfTest.java |  2 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |  2 +-
 .../continuous/GridEventConsumeSelfTest.java    |  4 +-
 .../util/future/GridFutureAdapterSelfTest.java  |  4 +-
 .../scalar/pimps/ScalarProjectionPimp.scala     | 16 +++----
 .../visor/commands/ack/VisorAckCommand.scala    |  4 +-
 .../visor/commands/gc/VisorGcCommand.scala      |  4 +-
 .../main/scala/org/gridgain/visor/visor.scala   |  6 +--
 72 files changed, 282 insertions(+), 283 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
index a4e26a3..3d0185c 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCompute.java
@@ -43,7 +43,7 @@ import java.util.concurrent.*;
  * <li>{@code affinity(...)} methods colocate jobs with nodes on which a specified key is cached.</li>
  * </ul>
  * Note that if attempt is made to execute a computation over an empty projection (i.e. projection that does
- * not have any alive nodes), then {@link GridEmptyProjectionException} will be thrown out of result future.
+ * not have any alive nodes), then {@link org.apache.ignite.cluster.ClusterGroupEmptyException} will be thrown out of result future.
  * <h1 class="header">Serializable</h1>
  * Also note that {@link Runnable} and {@link Callable} implementations must support serialization as required
  * by the configured marshaller. For example, {@link org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller} requires {@link Serializable}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
index 0945ebb..1f0187a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteMessaging.java
@@ -58,7 +58,7 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
      * @param topic Topic to send to, {@code null} for default topic.
      * @param msg Message to send.
      * @throws GridException If failed to send a message to any of the nodes.
-     * @throws GridEmptyProjectionException Thrown in case when this projection is empty.
+     * @throws org.apache.ignite.cluster.ClusterGroupEmptyException Thrown in case when this projection is empty.
      */
     public void send(@Nullable Object topic, Object msg) throws GridException;
 
@@ -69,7 +69,7 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
      * @param msgs Messages to send. Order of the sending is undefined. If the method produces
      *      the exception none or some messages could have been sent already.
      * @throws GridException If failed to send a message to any of the nodes.
-     * @throws GridEmptyProjectionException Thrown in case when this projection is empty.
+     * @throws org.apache.ignite.cluster.ClusterGroupEmptyException Thrown in case when this projection is empty.
      */
     public void send(@Nullable Object topic, Collection<?> msgs) throws GridException;
 
@@ -88,7 +88,7 @@ public interface IgniteMessaging extends IgniteAsyncSupport {
      * @param timeout Message timeout in milliseconds, {@code 0} for default
      *      which is {@link org.apache.ignite.configuration.IgniteConfiguration#getNetworkTimeout()}.
      * @throws GridException If failed to send a message to any of the nodes.
-     * @throws GridEmptyProjectionException Thrown in case when this projection is empty.
+     * @throws org.apache.ignite.cluster.ClusterGroupEmptyException Thrown in case when this projection is empty.
      */
     public void sendOrdered(@Nullable Object topic, Object msg, long timeout) throws GridException;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
new file mode 100644
index 0000000..14460da
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroupEmptyException.java
@@ -0,0 +1,47 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.cluster;
+
+import org.jetbrains.annotations.*;
+
+/**
+ * This exception defines illegal call on empty projection. Thrown by projection when operation
+ * that requires at least one node is called on empty projection.
+ */
+public class ClusterGroupEmptyException extends ClusterTopologyException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Creates new exception with default error message.
+     */
+    public ClusterGroupEmptyException() {
+        super("Cluster group is empty.");
+    }
+
+    /**
+     * Creates new exception with given error message.
+     *
+     * @param msg Error message.
+     */
+    public ClusterGroupEmptyException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Creates a new exception with given error message and optional nested cause exception.
+     *
+     * @param msg Error message.
+     * @param cause Optional nested exception (can be {@code null}).
+     */
+    public ClusterGroupEmptyException(String msg, @Nullable Throwable cause) {
+        super(msg, cause);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
new file mode 100644
index 0000000..bcc7dbe
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterTopologyException.java
@@ -0,0 +1,41 @@
+/* @java.file.header */
+
+/*  _________        _____ __________________        _____
+ *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
+ *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
+ *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
+ *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
+ */
+
+package org.apache.ignite.cluster;
+
+import org.gridgain.grid.*;
+import org.jetbrains.annotations.*;
+
+/**
+ * This exception is used to indicate error with grid topology (e.g., crashed node, etc.).
+ */
+public class ClusterTopologyException extends GridException {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /**
+     * Creates new topology exception with given error message.
+     *
+     * @param msg Error message.
+     */
+    public ClusterTopologyException(String msg) {
+        super(msg);
+    }
+
+    /**
+     * Creates new topology exception with given error message and optional
+     * nested exception.
+     *
+     * @param msg Error message.
+     * @param cause Optional nested exception (can be {@code null}).
+     */
+    public ClusterTopologyException(String msg, @Nullable Throwable cause) {
+        super(msg, cause);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java b/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java
deleted file mode 100644
index 43d1794..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cluster/GridEmptyProjectionException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.cluster;
-
-import org.apache.ignite.cluster.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This exception defines illegal call on empty projection. Thrown by projection when operation
- * that requires at least one node is called on empty projection.
- */
-public class GridEmptyProjectionException extends GridTopologyException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new exception with default error message.
-     */
-    public GridEmptyProjectionException() {
-        super("Grid projection is empty.");
-    }
-
-    /**
-     * Creates new exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public GridEmptyProjectionException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates a new exception with given error message and optional nested cause exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridEmptyProjectionException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java b/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
deleted file mode 100644
index 63399b7..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cluster/GridTopologyException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/* @java.file.header */
-
-/*  _________        _____ __________________        _____
- *  __  ____/___________(_)______  /__  ____/______ ____(_)_______
- *  _  / __  __  ___/__  / _  __  / _  / __  _  __ `/__  / __  __ \
- *  / /_/ /  _  /    _  /  / /_/ /  / /_/ /  / /_/ / _  /  _  / / /
- *  \____/   /_/     /_/   \_,__/   \____/   \__,_/  /_/   /_/ /_/
- */
-
-package org.apache.ignite.cluster;
-
-import org.gridgain.grid.*;
-import org.jetbrains.annotations.*;
-
-/**
- * This exception is used to indicate error with grid topology (e.g., crashed node, etc.).
- */
-public class GridTopologyException extends GridException {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /**
-     * Creates new topology exception with given error message.
-     *
-     * @param msg Error message.
-     */
-    public GridTopologyException(String msg) {
-        super(msg);
-    }
-
-    /**
-     * Creates new topology exception with given error message and optional
-     * nested exception.
-     *
-     * @param msg Error message.
-     * @param cause Optional nested exception (can be {@code null}).
-     */
-    public GridTopologyException(String msg, @Nullable Throwable cause) {
-        super(msg, cause);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
index 3960be1..087bb73 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeJobResult.java
@@ -59,7 +59,7 @@ public interface ComputeJobResult {
      *      If job on remote node was rejected (cancelled while it was on waiting queue), then
      *      {@link ComputeExecutionRejectedException} will be returned.
      *      <p>
-     *      If node on which job was computing failed, then {@link GridTopologyException} is
+     *      If node on which job was computing failed, then {@link org.apache.ignite.cluster.ClusterTopologyException} is
      *      returned.
      */
     public GridException getException();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
index a5bd68b..01a958c 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTask.java
@@ -81,7 +81,7 @@ import java.util.*;
  *          <ul>
  *          <li>
  *              Job has failed due to node crash. In this case {@link ComputeJobResult#getException()}
- *              method will return an instance of {@link GridTopologyException} exception.
+ *              method will return an instance of {@link org.apache.ignite.cluster.ClusterTopologyException} exception.
  *          </li>
  *          <li>
  *              Job execution was rejected, i.e. remote node has cancelled job before it got
@@ -145,7 +145,7 @@ import java.util.*;
  * <li>
  * {@link ComputeTaskAdapter} provides default implementation for {@link ComputeTask#result(ComputeJobResult, List)}
  * method which provides automatic fail-over to another node if remote job has failed
- * due to node crash (detected by {@link GridTopologyException} exception) or due to job
+ * due to node crash (detected by {@link org.apache.ignite.cluster.ClusterTopologyException} exception) or due to job
  * execution rejection (detected by {@link ComputeExecutionRejectedException} exception).
  * Here is an example of how a you would implement your task using {@link ComputeTaskAdapter}:
  * <pre name="code" class="java">

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
index feb0bae..fae5153 100644
--- a/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/compute/ComputeTaskAdapter.java
@@ -68,7 +68,7 @@ public abstract class ComputeTaskAdapter<T, R> implements ComputeTask<T, R> {
      * <p>
      * If remote job resulted in exception ({@link ComputeJobResult#getException()} is not {@code null}),
      * then {@link ComputeJobResultPolicy#FAILOVER} policy will be returned if the exception is instance
-     * of {@link org.apache.ignite.cluster.GridTopologyException} or {@link ComputeExecutionRejectedException}, which means that
+     * of {@link org.apache.ignite.cluster.ClusterTopologyException} or {@link ComputeExecutionRejectedException}, which means that
      * remote node either failed or job execution was rejected before it got a chance to start. In all
      * other cases the exception will be rethrown which will ultimately cause task to fail.
      *
@@ -86,7 +86,7 @@ public abstract class ComputeTaskAdapter<T, R> implements ComputeTask<T, R> {
         if (e != null) {
             // Don't failover user's code errors.
             if (e instanceof ComputeExecutionRejectedException ||
-                e instanceof GridTopologyException ||
+                e instanceof ClusterTopologyException ||
                 // Failover exception is always wrapped.
                 e.hasCause(ComputeJobFailoverException.class))
                 return ComputeJobResultPolicy.FAILOVER;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
index 274e589..a2e0f7c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernal.java
@@ -2708,7 +2708,7 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMBe
                         try {
                             compute(forNodes(neighbors)).execute(GridKillTask.class, false);
                         }
-                        catch (GridEmptyProjectionException ignored) {
+                        catch (ClusterGroupEmptyException ignored) {
                             // No-op, nothing to restart.
                         }
                     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index f0fade9..a7e01da 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -1244,7 +1244,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
             if (fut != null)
                 fut.get();
         }
-        catch (GridEmptyProjectionException ignore) {
+        catch (ClusterGroupEmptyException ignore) {
             if (log.isDebugEnabled())
                 log.debug("All remote nodes left while cache clear [cacheName=" + name() + "]");
         }
@@ -3687,7 +3687,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
 
             return globalSize;
         }
-        catch (GridEmptyProjectionException ignore) {
+        catch (ClusterGroupEmptyException ignore) {
             if (log.isDebugEnabled())
                 log.debug("All remote nodes left while cache clear [cacheName=" + name() + "]");
 
@@ -4589,7 +4589,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
 
             ctx.io().send(nodeId, res);
         }
-        catch (GridTopologyException ignored) {
+        catch (ClusterTopologyException ignored) {
             if (log.isDebugEnabled())
                 log.debug("Failed to send check prepared transaction response (did node leave grid?) [nodeId=" +
                     nodeId + ", res=" + res + ']');
@@ -4712,7 +4712,7 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
 
             ctx.io().send(nodeId, res);
         }
-        catch (GridTopologyException ignored) {
+        catch (ClusterTopologyException ignored) {
             if (log.isDebugEnabled())
                 log.debug("Failed to send check committed transaction response (did node leave grid?) [nodeId=" +
                     nodeId + ", res=" + res + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
index 0ace1a8..cd921c2 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEvictionManager.java
@@ -461,7 +461,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
                 log.debug("Sent eviction response [node=" + nodeId + ", localNode=" + cctx.nodeId() +
                     ", res" + res + ']');
         }
-        catch (GridTopologyException ignored) {
+        catch (ClusterTopologyException ignored) {
             if (log.isDebugEnabled())
                 log.debug("Failed to send eviction response since initiating node left grid " +
                     "[node=" + nodeId + ", localNode=" + cctx.nodeId() + ']');
@@ -1707,7 +1707,7 @@ public class GridCacheEvictionManager<K, V> extends GridCacheManagerAdapter<K, V
                 try {
                     cctx.io().send(nodeId, req);
                 }
-                catch (GridTopologyException ignored) {
+                catch (ClusterTopologyException ignored) {
                     // Node left the topology.
                     onNodeLeft(nodeId);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java
index 2d935df..daaacb8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheIoManager.java
@@ -333,7 +333,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V
      * @param node Node to send the message to.
      * @param msg Message to send.
      * @throws GridException If sending failed.
-     * @throws GridTopologyException If receiver left.
+     * @throws org.apache.ignite.cluster.ClusterTopologyException If receiver left.
      */
     public void send(ClusterNode node, GridCacheMessage<K, V> msg) throws GridException {
         send(node, msg, SYSTEM_POOL);
@@ -345,7 +345,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V
      * @param node Node to send the message to.
      * @param msg Message to send.
      * @throws GridException If sending failed.
-     * @throws GridTopologyException If receiver left.
+     * @throws org.apache.ignite.cluster.ClusterTopologyException If receiver left.
      */
     public void send(ClusterNode node, GridCacheMessage<K, V> msg, GridIoPolicy plc) throws GridException {
         assert !node.isLocal();
@@ -378,7 +378,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V
             }
             catch (GridException e) {
                 if (!cctx.discovery().alive(node.id()) || !cctx.discovery().pingNode(node.id()))
-                    throw new GridTopologyException("Node left grid while sending message to: " + node.id(), e);
+                    throw new ClusterTopologyException("Node left grid while sending message to: " + node.id(), e);
 
                 if (cnt == retryCnt)
                     throw e;
@@ -530,7 +530,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V
         ClusterNode n = cctx.discovery().node(nodeId);
 
         if (n == null)
-            throw new GridTopologyException("Failed to send message because node left grid [node=" + n + ", msg=" +
+            throw new ClusterTopologyException("Failed to send message because node left grid [node=" + n + ", msg=" +
                 msg + ']');
 
         send(n, msg);
@@ -564,7 +564,7 @@ public class GridCacheIoManager<K, V> extends GridCacheSharedManagerAdapter<K, V
             }
             catch (GridException e) {
                 if (cctx.discovery().node(node.id()) == null)
-                    throw new GridTopologyException("Node left grid while sending ordered message to: " + node.id(), e);
+                    throw new ClusterTopologyException("Node left grid while sending ordered message to: " + node.id(), e);
 
                 if (cnt == retryCnt)
                     throw e;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
index 5b8f19f..bedc33f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
@@ -911,7 +911,7 @@ public class GridCacheMvccManager<K, V> extends GridCacheSharedManagerAdapter<K,
     public IgniteFuture<?> finishAtomicUpdates(long topVer) {
         GridCompoundFuture<Object, Object> res = new GridCompoundFuture<>(cctx.kernalContext());
 
-        res.ignoreChildFailures(GridTopologyException.class, GridCachePartialUpdateException.class);
+        res.ignoreChildFailures(ClusterTopologyException.class, GridCachePartialUpdateException.class);
 
         for (GridCacheAtomicFuture<K, ?> fut : atomicFuts.values()) {
             if (fut.waitForPartitionExchange() && fut.topologyVersion() < topVer)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
index 76f772b..f729c0f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionExchangeManager.java
@@ -500,7 +500,7 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
 
             return true;
         }
-        catch (GridTopologyException ignore) {
+        catch (ClusterTopologyException ignore) {
             if (log.isDebugEnabled())
                 log.debug("Failed to send partition update to node because it left grid (will ignore) [node=" +
                     node.id() + ", msg=" + m + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index 24ff561..d0e2f8a 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -638,7 +638,7 @@ public class GridCacheTxHandler<K, V> {
             ctx.io().send(nodeId, res);
         }
         catch (GridException e) {
-            if (e instanceof GridTopologyException) {
+            if (e instanceof ClusterTopologyException) {
                 if (log.isDebugEnabled())
                     log.debug("Failed to send tx response to remote node (node left grid) [node=" + nodeId +
                         ", xid=" + req.version());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
index 84ec95b..c3961a4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -1207,7 +1207,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
                         nodes,
                         true).get();
                 }
-                catch (GridTopologyException e) {
+                catch (ClusterTopologyException e) {
                     if (log.isDebugEnabled())
                         log.debug("BlockSet job failed, will retry: " + e);
 
@@ -1220,7 +1220,7 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
                         nodes,
                         true).get();
                 }
-                catch (GridTopologyException e) {
+                catch (ClusterTopologyException e) {
                     if (log.isDebugEnabled())
                         log.debug("RemoveSetData job failed, will retry: " + e);
 
@@ -1311,10 +1311,10 @@ public final class GridCacheDataStructuresManager<K, V> extends GridCacheManager
                 try {
                     return call.call();
                 }
-                catch (GridEmptyProjectionException e) {
+                catch (ClusterGroupEmptyException e) {
                     throw new GridRuntimeException(e);
                 }
-                catch (GridCacheTxRollbackException | GridCachePartialUpdateException | GridTopologyException e) {
+                catch (GridCacheTxRollbackException | GridCachePartialUpdateException | ClusterTopologyException e) {
                     if (cnt++ == MAX_UPDATE_RETRIES)
                         throw e;
                     else {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
index 520884d..5abd2b7 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridTransactionalCacheQueueImpl.java
@@ -67,10 +67,10 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
                         break;
                     }
                 }
-                catch (GridEmptyProjectionException e) {
+                catch (ClusterGroupEmptyException e) {
                     throw e;
                 }
-                catch (GridTopologyException e) {
+                catch (ClusterTopologyException e) {
                     if (cnt++ == MAX_UPDATE_RETRIES)
                         throw e;
                     else {
@@ -114,10 +114,10 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
 
                     break;
                 }
-                catch (GridEmptyProjectionException e) {
+                catch (ClusterGroupEmptyException e) {
                     throw e;
                 }
-                catch(GridTopologyException e) {
+                catch(ClusterTopologyException e) {
                     if (cnt++ == MAX_UPDATE_RETRIES)
                         throw e;
                     else {
@@ -171,10 +171,10 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
 
                     break;
                 }
-                catch (GridEmptyProjectionException e) {
+                catch (ClusterGroupEmptyException e) {
                     throw e;
                 }
-                catch(GridTopologyException e) {
+                catch(ClusterTopologyException e) {
                     if (cnt++ == MAX_UPDATE_RETRIES)
                         throw e;
                     else {
@@ -214,10 +214,10 @@ public class GridTransactionalCacheQueueImpl<T> extends GridCacheQueueAdapter<T>
 
                     break;
                 }
-                catch (GridEmptyProjectionException e) {
+                catch (ClusterGroupEmptyException e) {
                     throw e;
                 }
-                catch(GridTopologyException e) {
+                catch(ClusterTopologyException e) {
                     if (cnt++ == MAX_UPDATE_RETRIES)
                         throw e;
                     else {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
index 9056916..301aeaa 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheOptimisticCheckPreparedTxFuture.java
@@ -149,7 +149,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound
                     try {
                         cctx.io().send(id, req);
                     }
-                    catch (GridTopologyException ignored) {
+                    catch (ClusterTopologyException ignored) {
                         fut.onNodeLeft();
                     }
                     catch (GridException e) {
@@ -170,7 +170,7 @@ public class GridCacheOptimisticCheckPreparedTxFuture<K, V> extends GridCompound
                 try {
                     cctx.io().send(nodeId, req);
                 }
-                catch (GridTopologyException ignored) {
+                catch (ClusterTopologyException ignored) {
                     fut.onNodeLeft();
                 }
                 catch (GridException e) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
index 7b8e749..965b1cf 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCachePessimisticCheckCommittedTxFuture.java
@@ -108,7 +108,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou
 
                 if (nearNode == null) {
                     // Near node failed, separate check prepared future will take care of it.
-                    onDone(new GridTopologyException("Failed to check near transaction state (near node left grid): " +
+                    onDone(new ClusterTopologyException("Failed to check near transaction state (near node left grid): " +
                         tx.eventNodeId()));
 
                     return;
@@ -137,7 +137,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou
             try {
                 cctx.io().send(rmtNode.id(), req);
             }
-            catch (GridTopologyException ignored) {
+            catch (ClusterTopologyException ignored) {
                 fut.onNodeLeft();
             }
             catch (GridException e) {
@@ -315,7 +315,7 @@ public class GridCachePessimisticCheckCommittedTxFuture<K, V> extends GridCompou
                 log.debug("Transaction node left grid (will ignore) [fut=" + this + ']');
 
             if (nearCheck) {
-                onDone(new GridTopologyException("Failed to check near transaction state (near node left grid): " +
+                onDone(new ClusterTopologyException("Failed to check near transaction state (near node left grid): " +
                     nodeId));
 
                 return;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
index 141efc3..171b19e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtAssignmentFetchFuture.java
@@ -155,7 +155,7 @@ public class GridDhtAssignmentFetchFuture<K, V> extends GridFutureAdapter<List<L
 
                     break;
                 }
-                catch (GridTopologyException ignored) {
+                catch (ClusterTopologyException ignored) {
                     U.warn(log0, "Failed to request affinity assignment from remote node (node left grid, will " +
                         "continue to another node): " + node);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 63b3d00..3662a42 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -458,7 +458,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
                 MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
-                    f.onResult(new GridTopologyException("Remote node left grid (will ignore): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will ignore): " + nodeId));
 
                     found = true;
                 }
@@ -863,8 +863,8 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
                     }
                     catch (GridException e) {
                         // Fail the whole thing.
-                        if (e instanceof GridTopologyException)
-                            fut.onResult((GridTopologyException)e);
+                        if (e instanceof ClusterTopologyException)
+                            fut.onResult((ClusterTopologyException)e);
                         else
                             fut.onResult(e);
                     }
@@ -923,7 +923,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
 
                         cctx.io().send(n, req);
                     }
-                    catch (GridTopologyException e) {
+                    catch (ClusterTopologyException e) {
                         fut.onResult(e);
                     }
                     catch (GridException e) {
@@ -1081,7 +1081,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo
         /**
          * @param e Node failure.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will ignore): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 050763a..6b05200 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -423,7 +423,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
                 // Reply back to sender.
                 ctx.io().send(nodeId, res);
             }
-            catch (GridTopologyException ignored) {
+            catch (ClusterTopologyException ignored) {
                 U.warn(log, "Failed to send lock reply to remote node because it left grid: " + nodeId);
 
                 fail = true;
@@ -1377,7 +1377,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
 
                 ctx.io().send(n, req);
             }
-            catch (GridTopologyException ignore) {
+            catch (ClusterTopologyException ignore) {
                 if (log.isDebugEnabled())
                     log.debug("Node left while sending unlock request: " + n);
             }
@@ -1405,7 +1405,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach
 
                     ctx.io().send(n, req);
                 }
-                catch (GridTopologyException ignore) {
+                catch (ClusterTopologyException ignore) {
                     if (log.isDebugEnabled())
                         log.debug("Node left while sending unlock request: " + n);
                 }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index 6234230..b1ca8e4 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -129,7 +129,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
                 MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
-                    f.onResult(new GridTopologyException("Remote node left grid (will retry): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will retry): " + nodeId));
 
                     return true;
                 }
@@ -334,8 +334,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
             }
             catch (GridException e) {
                 // Fail the whole thing.
-                if (e instanceof GridTopologyException)
-                    fut.onResult((GridTopologyException)e);
+                if (e instanceof ClusterTopologyException)
+                    fut.onResult((ClusterTopologyException)e);
                 else
                     fut.onResult(e);
             }
@@ -391,8 +391,8 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
                 }
                 catch (GridException e) {
                     // Fail the whole thing.
-                    if (e instanceof GridTopologyException)
-                        fut.onResult((GridTopologyException)e);
+                    if (e instanceof ClusterTopologyException)
+                        fut.onResult((ClusterTopologyException)e);
                     else
                         fut.onResult(e);
                 }
@@ -474,7 +474,7 @@ public final class GridDhtTxFinishFuture<K, V> extends GridCompoundIdentityFutur
         /**
          * @param e Node failure.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will ignore): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
index 89574b1..e6e206f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxLocal.java
@@ -625,7 +625,7 @@ public class GridDhtTxLocal<K, V> extends GridDhtTxLocalAdapter<K, V> implements
             try {
                 cctx.io().send(nearNodeId, res);
             }
-            catch (GridTopologyException ignored) {
+            catch (ClusterTopologyException ignored) {
                 if (log.isDebugEnabled())
                     log.debug("Node left before sending finish response (transaction was committed) [node=" +
                         nearNodeId + ", res=" + res + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index c434d86..40d2593 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -242,7 +242,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
                 MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
-                    f.onResult(new GridTopologyException("Remote node left grid (will retry): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will retry): " + nodeId));
 
                     return true;
                 }
@@ -675,7 +675,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
                 try {
                     cctx.io().send(n, req);
                 }
-                catch (GridTopologyException e) {
+                catch (ClusterTopologyException e) {
                     fut.onResult(e);
                 }
                 catch (GridException e) {
@@ -729,7 +729,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
                     try {
                         cctx.io().send(nearMapping.node(), req);
                     }
-                    catch (GridTopologyException e) {
+                    catch (ClusterTopologyException e) {
                         fut.onResult(e);
                     }
                     catch (GridException e) {
@@ -938,7 +938,7 @@ public final class GridDhtTxPrepareFuture<K, V> extends GridCompoundIdentityFutu
         /**
          * @param e Node failure.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will ignore): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 9adb95c..d342bb3 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -198,7 +198,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
                 MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
-                    f.onResult(new GridTopologyException("Remote node left grid (will retry): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will retry): " + nodeId));
 
                     return true;
                 }
@@ -252,7 +252,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
      */
     private void map(Collection<? extends K> keys, Map<ClusterNode, LinkedHashMap<K, Boolean>> mapped, long topVer) {
         if (CU.affinityNodes(cctx, topVer).isEmpty()) {
-            onDone(new GridTopologyException("Failed to map keys for cache (all partition nodes left the grid)."));
+            onDone(new ClusterTopologyException("Failed to map keys for cache (all partition nodes left the grid)."));
 
             return;
         }
@@ -355,8 +355,8 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
                 }
                 catch (GridException e) {
                     // Fail the whole thing.
-                    if (e instanceof GridTopologyException)
-                        fut.onResult((GridTopologyException)e);
+                    if (e instanceof ClusterTopologyException)
+                        fut.onResult((ClusterTopologyException)e);
                     else
                         fut.onResult(e);
                 }
@@ -438,7 +438,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
 
                 if (keys != null && keys.containsKey(key)) {
                     if (remapCnt.incrementAndGet() > MAX_REMAP_CNT) {
-                        onDone(new GridTopologyException("Failed to remap key to a new node after " + MAX_REMAP_CNT
+                        onDone(new ClusterTopologyException("Failed to remap key to a new node after " + MAX_REMAP_CNT
                             + " attempts (key got remapped to the same node) [key=" + key + ", node=" +
                             U.toShortString(node) + ", mappings=" + mapped + ']'));
 
@@ -598,7 +598,7 @@ public class GridPartitionedGetFuture<K, V> extends GridCompoundIdentityFuture<M
          * @param e Failure exception.
          */
         @SuppressWarnings("UnusedParameters")
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will retry): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 87ef7c2..b78eda0 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2098,7 +2098,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
                 sendDeferredUpdateResponse(nodeId, req.futureVersion());
             }
         }
-        catch (GridTopologyException ignored) {
+        catch (ClusterTopologyException ignored) {
             U.warn(log, "Failed to send DHT atomic update response to node because it left grid: " +
                 req.nodeId());
         }
@@ -2203,7 +2203,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
         try {
             ctx.io().send(nodeId, res);
         }
-        catch (GridTopologyException ignored) {
+        catch (ClusterTopologyException ignored) {
             U.warn(log, "Failed to send near update reply to node because it left grid: " +
                 nodeId);
         }
@@ -2477,7 +2477,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
                     log.debug("Failed to send deferred dht update response to remote node (grid is stopping) " +
                         "[nodeId=" + nodeId + ", msg=" + msg + ']');
             }
-            catch (GridTopologyException ignored) {
+            catch (ClusterTopologyException ignored) {
                 if (log.isDebugEnabled())
                     log.debug("Failed to send deferred dht update response to remote node (did node leave grid?) " +
                         "[nodeId=" + nodeId + ", msg=" + msg + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 6063641..70aab97 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -140,7 +140,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
         GridDhtAtomicUpdateRequest<K, V> req = mappings.get(nodeId);
 
         if (req != null) {
-            updateRes.addFailedKeys(req.keys(), new GridTopologyException("Failed to write keys on backup (node left" +
+            updateRes.addFailedKeys(req.keys(), new ClusterTopologyException("Failed to write keys on backup (node left" +
                 " grid before response is received): " + nodeId));
 
             // Remove only after added keys to failed set.
@@ -321,7 +321,7 @@ public class GridDhtAtomicUpdateFuture<K, V> extends GridFutureAdapter<Void>
 
                     cctx.io().send(req.nodeId(), req);
                 }
-                catch (GridTopologyException ignored) {
+                catch (ClusterTopologyException ignored) {
                     U.warn(log, "Failed to send update request to backup node because it left grid: " +
                         req.nodeId());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index eba9afb..3a3eeef 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -256,7 +256,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
             if (singleNodeId.equals(nodeId)) {
                 onDone(addFailedKeys(
                     singleReq.keys(),
-                    new GridTopologyException("Primary node left grid before response is received: " + nodeId)));
+                    new ClusterTopologyException("Primary node left grid before response is received: " + nodeId)));
 
                 return true;
             }
@@ -267,7 +267,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
         GridNearAtomicUpdateRequest<K, V> req = mappings.get(nodeId);
 
         if (req != null) {
-            addFailedKeys(req.keys(), new GridTopologyException("Primary node left grid before response is " +
+            addFailedKeys(req.keys(), new ClusterTopologyException("Primary node left grid before response is " +
                 "received: " + nodeId));
 
             mappings.remove(nodeId);
@@ -470,7 +470,7 @@ public class GridNearAtomicUpdateFuture<K, V> extends GridFutureAdapter<Object>
         Collection<ClusterNode> topNodes = CU.affinityNodes(cctx, topVer);
 
         if (F.isEmpty(topNodes)) {
-            onDone(new GridTopologyException("Failed to map keys for cache (all partition nodes left the grid)."));
+            onDone(new ClusterTopologyException("Failed to map keys for cache (all partition nodes left the grid)."));
 
             return;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 2d69f7d..9cb6ab9 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -594,7 +594,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
             assert topVer > 0;
 
             if (CU.affinityNodes(cctx, topVer).isEmpty()) {
-                onDone(new GridTopologyException("Failed to map keys for cache (all partition nodes left the grid)."));
+                onDone(new ClusterTopologyException("Failed to map keys for cache (all partition nodes left the grid)."));
 
                 return;
             }
@@ -834,7 +834,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
 
                     cctx.io().send(node, req);
                 }
-                catch (GridTopologyException ex) {
+                catch (ClusterTopologyException ex) {
                     assert fut != null;
 
                     fut.onResult(ex);
@@ -849,7 +849,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
 
                             cctx.io().send(node, req);
                         }
-                        catch (GridTopologyException ex) {
+                        catch (ClusterTopologyException ex) {
                             assert fut != null;
 
                             fut.onResult(ex);
@@ -1045,8 +1045,8 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
      * @param nodeId Node ID.
      * @return Topology exception with user-friendly message.
      */
-    private GridTopologyException newTopologyException(@Nullable Throwable nested, UUID nodeId) {
-        return new GridTopologyException("Failed to acquire lock for keys (primary node left grid, " +
+    private ClusterTopologyException newTopologyException(@Nullable Throwable nested, UUID nodeId) {
+        return new ClusterTopologyException("Failed to acquire lock for keys (primary node left grid, " +
             "retry transaction if possible) [keys=" + keys + ", node=" + nodeId + ']', nested);
     }
 
@@ -1162,7 +1162,7 @@ public final class GridDhtColocatedLockFuture<K, V> extends GridCompoundIdentity
         /**
          * @param e Node left exception.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (isDone())
                 return;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 11143c0..9f7dde8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -157,7 +157,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
 
                 if (type == EVT_NODE_LEFT || type == EVT_NODE_FAILED) {
                     if (mini.node().id().equals(evt.eventNode().id())) {
-                        mini.onResult(new GridTopologyException("Node left grid (will retry): " +
+                        mini.onResult(new ClusterTopologyException("Node left grid (will retry): " +
                             evt.eventNode().id()));
 
                         break;
@@ -256,8 +256,8 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
                     }
                     catch (GridException e) {
                         // Fail the whole thing.
-                        if (e instanceof GridTopologyException)
-                            fut.onResult((GridTopologyException)e);
+                        if (e instanceof ClusterTopologyException)
+                            fut.onResult((ClusterTopologyException)e);
                         else
                             fut.onResult(e);
                     }
@@ -443,7 +443,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec
         /**
          * @param e Node failure.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will retry): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index 5e3a3d3..4885d6b 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -568,7 +568,7 @@ public class GridDhtPartitionDemandPool<K, V> {
          * @param exchFut Exchange future.
          * @return Missed partitions.
          * @throws InterruptedException If interrupted.
-         * @throws GridTopologyException If node left.
+         * @throws org.apache.ignite.cluster.ClusterTopologyException If node left.
          * @throws GridException If failed to send message.
          */
         private Set<Integer> demandFromNode(ClusterNode node, final long topVer, GridDhtPartitionDemandMessage<K, V> d,
@@ -906,7 +906,7 @@ public class GridDhtPartitionDemandPool<K, V> {
                                 catch (GridInterruptedException e) {
                                     throw e;
                                 }
-                                catch (GridTopologyException e) {
+                                catch (ClusterTopologyException e) {
                                     if (log.isDebugEnabled())
                                         log.debug("Node left during preloading (will retry) [node=" + node.id() +
                                             ", msg=" + e.getMessage() + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
index e605b0c..cb53507 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplyPool.java
@@ -512,7 +512,7 @@ class GridDhtPartitionSupplyPool<K, V> {
 
                 return true;
             }
-            catch (GridTopologyException ignore) {
+            catch (ClusterTopologyException ignore) {
                 if (log.isDebugEnabled())
                     log.debug("Failed to send partition supply message because node left grid: " + n.id());
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 7f47127..e70ccdb 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -587,7 +587,7 @@ public class GridDhtPartitionsExchangeFuture<K, V> extends GridFutureAdapter<Lon
         try {
             sendLocalPartitions(oldestNode, exchId);
         }
-        catch (GridTopologyException ignore) {
+        catch (ClusterTopologyException ignore) {
             if (log.isDebugEnabled())
                 log.debug("Oldest node left during partition exchange [nodeId=" + oldestNode.id() +
                     ", exchId=" + exchId + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index bd793fe..ce8cd2f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -364,7 +364,7 @@ public class GridDhtPreloader<K, V> extends GridCachePreloaderAdapter<K, V> {
 
             cctx.io().send(node, res);
         }
-        catch (GridTopologyException ignore) {
+        catch (ClusterTopologyException ignore) {
             if (log.isDebugEnabled())
                 log.debug("Received force key request form failed node (will ignore) [nodeId=" + node.id() +
                     ", req=" + msg + ']');

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
index 83a2350..2050742 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -199,7 +199,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
                 MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
-                    f.onResult(new GridTopologyException("Remote node left grid (will retry): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will retry): " + nodeId));
 
                     return true;
                 }
@@ -257,7 +257,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
         if (affNodes.isEmpty()) {
             assert !isAffinityNode(cctx.config());
 
-            onDone(new GridTopologyException("Failed to map keys for near-only cache (all partition " +
+            onDone(new ClusterTopologyException("Failed to map keys for near-only cache (all partition " +
                 "nodes left the grid)."));
 
             return;
@@ -358,8 +358,8 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
                 }
                 catch (GridException e) {
                     // Fail the whole thing.
-                    if (e instanceof GridTopologyException)
-                        fut.onResult((GridTopologyException)e);
+                    if (e instanceof ClusterTopologyException)
+                        fut.onResult((ClusterTopologyException)e);
                     else
                         fut.onResult(e);
                 }
@@ -479,7 +479,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
 
                     if (keys != null && keys.containsKey(key)) {
                         if (remapCnt.incrementAndGet() > MAX_REMAP_CNT) {
-                            onDone(new GridTopologyException("Failed to remap key to a new node after " + MAX_REMAP_CNT
+                            onDone(new ClusterTopologyException("Failed to remap key to a new node after " + MAX_REMAP_CNT
                                 + " attempts (key got remapped to the same node) [key=" + key + ", node=" +
                                 U.toShortString(primary) + ", mappings=" + mapped + ']'));
 
@@ -689,7 +689,7 @@ public final class GridNearGetFuture<K, V> extends GridCompoundIdentityFuture<Ma
         /**
          * @param e Topology exception.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will retry): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
index 262f424..a63ff2c 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -717,7 +717,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
             assert topVer > 0;
 
             if (CU.affinityNodes(cctx, topVer).isEmpty()) {
-                onDone(new GridTopologyException("Failed to map keys for near-only cache (all " +
+                onDone(new ClusterTopologyException("Failed to map keys for near-only cache (all " +
                     "partition nodes left the grid)."));
 
                 return;
@@ -1101,7 +1101,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
 
                     cctx.io().send(node, req);
                 }
-                catch (GridTopologyException ex) {
+                catch (ClusterTopologyException ex) {
                     assert fut != null;
 
                     fut.onResult(ex);
@@ -1116,7 +1116,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
 
                             cctx.io().send(node, req);
                         }
-                        catch (GridTopologyException ex) {
+                        catch (ClusterTopologyException ex) {
                             assert fut != null;
 
                             fut.onResult(ex);
@@ -1173,8 +1173,8 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
      * @param nodeId Node ID.
      * @return Topology exception with user-friendly message.
      */
-    private GridTopologyException newTopologyException(@Nullable Throwable nested, UUID nodeId) {
-        return new GridTopologyException("Failed to acquire lock for keys (primary node left grid, " +
+    private ClusterTopologyException newTopologyException(@Nullable Throwable nested, UUID nodeId) {
+        return new ClusterTopologyException("Failed to acquire lock for keys (primary node left grid, " +
             "retry transaction if possible) [keys=" + keys + ", node=" + nodeId + ']', nested);
     }
 
@@ -1293,7 +1293,7 @@ public final class GridNearLockFuture<K, V> extends GridCompoundIdentityFuture<B
         /**
          * @param e Node left exception.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (isDone())
                 return;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index 48f30dd..be1448f 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -129,7 +129,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
                     // Remove previous mapping.
                     mappings.remove(nodeId);
 
-                    f.onResult(new GridTopologyException("Remote node left grid (will fail): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will fail): " + nodeId));
 
                     return true;
                 }
@@ -379,7 +379,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
                 if (!isSync() && !m.explicitLock())
                     fut.onDone();
             }
-            catch (GridTopologyException e) {
+            catch (ClusterTopologyException e) {
                 // Remove previous mapping.
                 mappings.remove(m.node().id());
 
@@ -463,7 +463,7 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu
         /**
          * @param e Node failure.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (log.isDebugEnabled())
                 log.debug("Remote node left grid while sending or waiting for reply (will fail): " + this);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
index ac6ba7a..607a08e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridNearTxPrepareFuture.java
@@ -160,7 +160,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
                 MiniFuture f = (MiniFuture)fut;
 
                 if (f.node().id().equals(nodeId)) {
-                    f.onResult(new GridTopologyException("Remote node left grid (will retry): " + nodeId));
+                    f.onResult(new ClusterTopologyException("Remote node left grid (will retry): " + nodeId));
 
                     found = true;
                 }
@@ -440,7 +440,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
             GridCacheContext<K, V> cacheCtx = cctx.cacheContext(cacheId);
 
             if (CU.affinityNodes(cacheCtx, topVer).isEmpty()) {
-                onDone(new GridTopologyException("Failed to map keys for cache (all " +
+                onDone(new ClusterTopologyException("Failed to map keys for cache (all " +
                     "partition nodes left the grid): " + cacheCtx.name()));
 
                 return;
@@ -772,7 +772,7 @@ public final class GridNearTxPrepareFuture<K, V> extends GridCompoundIdentityFut
         /**
          * @param e Node failure.
          */
-        void onResult(GridTopologyException e) {
+        void onResult(ClusterTopologyException e) {
             if (isDone())
                 return;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java
index 86b5e75..8dcd202 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -269,7 +269,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
 
                 return true;
             }
-            catch (GridTopologyException ignored) {
+            catch (ClusterTopologyException ignored) {
                 if (log.isDebugEnabled())
                     log.debug("Failed to send query response since node left grid [nodeId=" + nodeId +
                         ", res=" + res + "]");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1f7f61ed/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index e8bf233..6384cd8 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@ -240,7 +240,7 @@ public class GridCacheContinuousQueryAdapter<K, V> implements GridCacheContinuou
         prj = prj.forCache(ctx.name());
 
         if (prj.nodes().isEmpty())
-            throw new GridTopologyException("Failed to execute query (projection is empty): " + this);
+            throw new ClusterTopologyException("Failed to execute query (projection is empty): " + this);
 
         GridCacheMode mode = ctx.config().getCacheMode();
 


Mime
View raw message