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 CFB0F18676 for ; Thu, 2 Jul 2015 08:48:26 +0000 (UTC) Received: (qmail 32525 invoked by uid 500); 2 Jul 2015 08:48:26 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 32494 invoked by uid 500); 2 Jul 2015 08:48:26 -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 32485 invoked by uid 99); 2 Jul 2015 08:48:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jul 2015 08:48:26 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,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; Thu, 02 Jul 2015 08:46:06 +0000 Received: (qmail 25007 invoked by uid 99); 2 Jul 2015 08:47:48 -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; Thu, 02 Jul 2015 08:47:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5FA5EE35DD; Thu, 2 Jul 2015 08:47:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 02 Jul 2015 08:48:28 -0000 Message-Id: In-Reply-To: <911a362da6604915b0acd6f3c5e3a1ce@git.apache.org> References: <911a362da6604915b0acd6f3c5e3a1ce@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [42/50] [abbrv] incubator-ignite git commit: # ignite-sprint-7 fixed failNode() X-Virus-Checked: Checked by ClamAV on apache.org # ignite-sprint-7 fixed failNode() Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ea64e03 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ea64e03 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ea64e03 Branch: refs/heads/ignite-843 Commit: 7ea64e038fd7df6418ec98a18b3665014701587d Parents: d3783a1 Author: sboikov Authored: Thu Jul 2 10:03:00 2015 +0300 Committer: sboikov Committed: Thu Jul 2 10:03:00 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 5 +++-- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ea64e03/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 04276d2..3f05f59 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -339,11 +339,12 @@ class ClientImpl extends TcpDiscoveryImpl { /** {@inheritDoc} */ @Override public void failNode(UUID nodeId, @Nullable String warning) { - ClusterNode node = rmtNodes.get(nodeId); + TcpDiscoveryNode node = rmtNodes.get(nodeId); if (node != null) { TcpDiscoveryNodeFailedMessage msg = new TcpDiscoveryNodeFailedMessage(getLocalNodeId(), - node.id(), node.order()); + node.id(), + node.internalOrder()); msg.warning(warning); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ea64e03/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 720ce3a..94a2290 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -585,11 +585,12 @@ class ServerImpl extends TcpDiscoveryImpl { /** {@inheritDoc} */ @Override public void failNode(UUID nodeId, @Nullable String warning) { - ClusterNode node = ring.node(nodeId); + TcpDiscoveryNode node = ring.node(nodeId); if (node != null) { TcpDiscoveryNodeFailedMessage msg = new TcpDiscoveryNodeFailedMessage(getLocalNodeId(), - node.id(), node.order()); + node.id(), + node.internalOrder()); msg.warning(warning);