ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [3/4] ignite git commit: ignite-3116 Fixed NodeStoppingException in GridDhtGetFuture.
Date Mon, 30 May 2016 05:40:33 GMT
ignite-3116 Fixed NodeStoppingException in GridDhtGetFuture.


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

Branch: refs/heads/ignite-3038
Commit: 303d3caecf5fa335f5b9cb13a09ce3765901462f
Parents: 1abe115
Author: sboikov <sboikov@gridgain.com>
Authored: Fri May 27 14:21:01 2016 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Fri May 27 14:21:01 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/303d3cae/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/303d3cae/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 + ']');


Mime
View raw message