You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/03/02 11:31:21 UTC
[44/50] [abbrv] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-2.0
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 <sb...@gridgain.com>
Authored: Mon Feb 20 14:44:26 2017 +0300
Committer: sboikov <sb...@gridgain.com>
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<DiscoverySpi> {
}
/** @return all alive server nodes is topology */
- public Collection<ClusterNode> aliveSrvNodes() {
- return discoCache().aliveSrvNodes();
+ public Collection<ClusterNode> aliveServerNodes() {
+ return discoCache().aliveServerNodes();
}
/** @return Full topology size. */
@@ -2525,6 +2523,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
/** Highest node order. */
private final long maxOrder;
+ /** Alive server nodes */
+ private final Collection<ClusterNode> aliveSrvNodes;
+
/**
* Cached alive server remote nodes with caches.
*/
@@ -2728,9 +2729,9 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
/**
- * Gets all alive server nodes.
+ * @return All alive server nodes.
*/
- Collection<ClusterNode> aliveSrvNodes() {
+ Collection<ClusterNode> 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<MappingExchangeResult>
) {
ioMgr = ctx.io();
discoMgr = ctx.discovery();
- aliveSrvNodes = new LinkedList<>(discoMgr.aliveSrvNodes());
+ aliveSrvNodes = new LinkedList<>(discoMgr.aliveServerNodes());
this.item = item;
this.syncMap = syncMap;