Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B0935177DE for ; Wed, 15 Apr 2015 14:36:44 +0000 (UTC) Received: (qmail 84798 invoked by uid 500); 15 Apr 2015 14:36:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84770 invoked by uid 500); 15 Apr 2015 14:36:44 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 84761 invoked by uid 99); 15 Apr 2015 14:36:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 14:36:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 15 Apr 2015 14:36:16 +0000 Received: (qmail 83167 invoked by uid 99); 15 Apr 2015 14:36:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 14:36:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8C6D0E0664; Wed, 15 Apr 2015 14:36:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Wed, 15 Apr 2015 14:36:36 -0000 Message-Id: <230f8f424b954db788c9fd99fb2c5aac@git.apache.org> In-Reply-To: <87dd50dc2ea7481ab3531474d6b784d2@git.apache.org> References: <87dd50dc2ea7481ab3531474d6b784d2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/50] incubator-ignite git commit: # ignite-742 X-Virus-Checked: Checked by ClamAV on apache.org # ignite-742 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4fe2a9a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4fe2a9a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4fe2a9a6 Branch: refs/heads/ignite-446 Commit: 4fe2a9a6b9112f38ef41e84adc42871ce425d113 Parents: fb74a83 Author: sboikov Authored: Wed Apr 15 09:17:03 2015 +0300 Committer: sboikov Committed: Wed Apr 15 09:17:03 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridPartitionedGetFuture.java | 9 +++++++-- .../cache/distributed/near/GridNearGetFuture.java | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fe2a9a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java index d5db26d..f37daf8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java @@ -203,15 +203,20 @@ public class GridPartitionedGetFuture extends GridCompoundIdentityFuture> fut : futures()) if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; - if (f.node().id().equals(nodeId)) + if (f.node().id().equals(nodeId)) { + found = true; + f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid (will retry): " + nodeId)); + } } - return false; + return found; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4fe2a9a6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index b1638ca..e75c49e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -203,15 +203,20 @@ public final class GridNearGetFuture extends GridCompoundIdentityFuture> fut : futures()) if (isMini(fut)) { MiniFuture f = (MiniFuture)fut; - if (f.node().id().equals(nodeId)) + if (f.node().id().equals(nodeId)) { + found = true; + f.onNodeLeft(new ClusterTopologyCheckedException("Remote node left grid (will retry): " + nodeId)); + } } - return false; + return found; } /**