Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2B36C200C3A for ; Thu, 2 Mar 2017 12:30:44 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 29F7B160B7D; Thu, 2 Mar 2017 11:30:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9EE47160B97 for ; Thu, 2 Mar 2017 12:30:42 +0100 (CET) Received: (qmail 77578 invoked by uid 500); 2 Mar 2017 11:30:41 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 76017 invoked by uid 99); 2 Mar 2017 11:30:39 -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 Mar 2017 11:30:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0EC43DFDE6; Thu, 2 Mar 2017 11:30:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Thu, 02 Mar 2017 11:31:21 -0000 Message-Id: <35ff99940c86432a9343bda05fe97342@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [44/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-2.0 archived-at: Thu, 02 Mar 2017 11:30:44 -0000 Merge remote-tracking branch 'remotes/origin/master' into ignite-2.0 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java # modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e1d8224c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e1d8224c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e1d8224c Branch: refs/heads/ignite-4565-ddl Commit: e1d8224c156a11dbdd79da20437edd75cc818dc4 Parents: 0d2d5b3 Author: sboikov Authored: Mon Feb 20 14:44:26 2017 +0300 Committer: sboikov Committed: Mon Feb 20 14:46:02 2017 +0300 ---------------------------------------------------------------------- .../managers/discovery/GridDiscoveryManager.java | 13 +++++++------ .../processors/marshaller/ClientRequestFuture.java | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e1d8224c/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index e0d4593..def811b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -17,8 +17,6 @@ package org.apache.ignite.internal.managers.discovery; -import java.io.Serializable; -import java.io.Externalizable; import java.lang.management.GarbageCollectorMXBean; import java.lang.management.ManagementFactory; import java.lang.management.MemoryMXBean; @@ -1555,8 +1553,8 @@ public class GridDiscoveryManager extends GridManagerAdapter { } /** @return all alive server nodes is topology */ - public Collection aliveSrvNodes() { - return discoCache().aliveSrvNodes(); + public Collection aliveServerNodes() { + return discoCache().aliveServerNodes(); } /** @return Full topology size. */ @@ -2525,6 +2523,9 @@ public class GridDiscoveryManager extends GridManagerAdapter { /** Highest node order. */ private final long maxOrder; + /** Alive server nodes */ + private final Collection aliveSrvNodes; + /** * Cached alive server remote nodes with caches. */ @@ -2728,9 +2729,9 @@ public class GridDiscoveryManager extends GridManagerAdapter { } /** - * Gets all alive server nodes. + * @return All alive server nodes. */ - Collection aliveSrvNodes() { + Collection aliveServerNodes() { return aliveSrvNodes; } http://git-wip-us.apache.org/repos/asf/ignite/blob/e1d8224c/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java index a361760..773dabe 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/ClientRequestFuture.java @@ -77,7 +77,7 @@ final class ClientRequestFuture extends GridFutureAdapter ) { ioMgr = ctx.io(); discoMgr = ctx.discovery(); - aliveSrvNodes = new LinkedList<>(discoMgr.aliveSrvNodes()); + aliveSrvNodes = new LinkedList<>(discoMgr.aliveServerNodes()); this.item = item; this.syncMap = syncMap;