ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/6] ignite git commit: ignite-5566
Date Thu, 22 Jun 2017 12:15:53 GMT
ignite-5566


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

Branch: refs/heads/ignite-5566
Commit: 6c50feba92d9c1c4de84dc8346791c14ab83aae0
Parents: 9e0cf67
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jun 22 15:15:39 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jun 22 15:15:39 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/managers/communication/GridIoManager.java   | 5 +++--
 .../ignite/internal/processors/cache/GridCacheIoManager.java    | 5 +++--
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java          | 2 +-
 .../processors/cache/query/GridCacheDistributedQueryFuture.java | 2 +-
 .../cache/query/GridCacheDistributedQueryManager.java           | 2 +-
 .../ignite/internal/processors/query/GridQueryProcessor.java    | 1 -
 6 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6c50feba/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index c0d7fd7..a1ddaf4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1571,15 +1571,16 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
     /**
      * @param nodeId Node ID.
      * @param sndErr Send error.
+     * @param ping {@code True} if try ping node.
      * @return {@code True} if node left.
      * @throws IgniteClientDisconnectedCheckedException If ping failed.
      */
-    public boolean checkNodeLeft(UUID nodeId, IgniteCheckedException sndErr)
+    public boolean checkNodeLeft(UUID nodeId, IgniteCheckedException sndErr, boolean ping)
         throws IgniteClientDisconnectedCheckedException
     {
         return sndErr instanceof ClusterTopologyCheckedException ||
             ctx.discovery().node(nodeId) == null ||
-            !ctx.discovery().pingNode(nodeId);
+            (ping && !ctx.discovery().pingNode(nodeId));
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c50feba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 5ae97f1..a920bd0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -1083,11 +1083,12 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
      * @param nodeId Node ID.
      * @param sndErr Send error.
      * @return {@code True} if node left.
+     * @param ping {@code True} if try ping node.
      * @throws IgniteClientDisconnectedCheckedException If ping failed.
      */
-    public boolean checkNodeLeft(UUID nodeId, IgniteCheckedException sndErr)
+    public boolean checkNodeLeft(UUID nodeId, IgniteCheckedException sndErr, boolean ping)
         throws IgniteClientDisconnectedCheckedException {
-        return cctx.gridIO().checkNodeLeft(nodeId, sndErr);
+        return cctx.gridIO().checkNodeLeft(nodeId, sndErr, ping);
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c50feba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index a0e87fa..c8138f7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1119,7 +1119,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
                 cctx.io().send(node, m, SYSTEM_POOL);
             }
             catch (IgniteCheckedException e) {
-                if (cctx.io().checkNodeLeft(node.id(), e)) {
+                if (cctx.io().checkNodeLeft(node.id(), e, false)) {
                     if (log.isDebugEnabled())
                         log.debug("Failed to send partitions, node failed: " + node);
                 }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c50feba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
index e393c36..241a1e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryFuture.java
@@ -120,7 +120,7 @@ public class GridCacheDistributedQueryFuture<K, V, R> extends GridCacheQueryFutu
                         cctx.io().send(node, req, cctx.ioPolicy());
                     }
                     catch (IgniteCheckedException e) {
-                        if (cctx.io().checkNodeLeft(node.id(), e)) {
+                        if (cctx.io().checkNodeLeft(node.id(), e, false)) {
                             if (log.isDebugEnabled())
                                 log.debug("Failed to send cancel request, node failed: "
+ node);
                         }

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c50feba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 2de6223..63228a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -805,7 +805,7 @@ public class GridCacheDistributedQueryManager<K, V> extends GridCacheQueryManage
                     cctx.io().send(node, req, GridIoPolicy.QUERY_POOL);
                 }
                 catch (IgniteCheckedException e) {
-                    if (cctx.io().checkNodeLeft(node.id(), e)) {
+                    if (cctx.io().checkNodeLeft(node.id(), e, true)) {
                         fut.onNodeLeft(node.id());
 
                         if (fut.isDone())

http://git-wip-us.apache.org/repos/asf/ignite/blob/6c50feba/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 788a710..dd07584 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -54,7 +54,6 @@ import org.apache.ignite.events.CacheQueryExecutedEvent;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteInternalFuture;
 import org.apache.ignite.internal.NodeStoppingException;
-import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
 import org.apache.ignite.internal.managers.communication.GridMessageListener;
 import org.apache.ignite.internal.processors.GridProcessorAdapter;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;


Mime
View raw message