You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/05/26 06:30:47 UTC
[17/17] ignite git commit: ignite-3116 Cancel force key futures when
node stops
ignite-3116 Cancel force key futures when node stops
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9fa8b3d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9fa8b3d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9fa8b3d
Branch: refs/heads/ignite-3116
Commit: a9fa8b3d1adba0fb9e64637782c6d3ceb36ca865
Parents: fc3b154
Author: sboikov <sb...@gridgain.com>
Authored: Thu May 26 09:28:59 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu May 26 09:28:59 2016 +0300
----------------------------------------------------------------------
.../processors/cache/distributed/dht/GridDhtCacheAdapter.java | 7 +++++++
.../processors/cache/distributed/dht/GridDhtGetFuture.java | 3 ---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a9fa8b3d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 26800ad..a74cf26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -35,6 +35,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.NodeStoppingException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.CacheOperationContext;
@@ -791,6 +792,9 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
req.addDeploymentInfo());
}
}
+ catch (NodeStoppingException e) {
+ return;
+ }
catch (IgniteCheckedException e) {
U.error(log, "Failed processing get request: " + req, e);
@@ -856,6 +860,9 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
res.entries(entries);
}
+ catch (NodeStoppingException e) {
+ return;
+ }
catch (IgniteCheckedException e) {
U.error(log, "Failed processing get request: " + req, e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a9fa8b3d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 4d4c303..cae1dda 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -182,9 +182,6 @@ public final class GridDhtGetFuture<K, V> extends GridCompoundIdentityFuture<Col
try {
fut.get();
}
- catch (NodeStoppingException e) {
- return;
- }
catch (IgniteCheckedException e) {
if (log.isDebugEnabled())
log.debug("Failed to request keys from preloader [keys=" + keys + ", err=" + e + ']');