You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/07 10:25:26 UTC
[30/40] incubator-ignite git commit: ignite-747: reverting changes
ignite-747: reverting changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c73d162
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c73d162
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c73d162
Branch: refs/heads/ignite-747
Commit: 6c73d1625c581f964f396b330ad3d21c9d58cd8a
Parents: cf282fb
Author: Denis Magda <dm...@gridgain.com>
Authored: Mon Jul 6 14:49:13 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Mon Jul 6 14:49:13 2015 +0300
----------------------------------------------------------------------
.../managers/discovery/GridDiscoveryManager.java | 3 +--
.../apache/ignite/internal/util/IgniteUtils.java | 6 +++++-
.../apache/ignite/internal/util/lang/GridFunc.java | 16 ----------------
3 files changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c73d162/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 616e27c..a8ce8ff 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
@@ -438,8 +438,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
// There is no race possible between history maintenance and concurrent discovery
// event notifications, since SPI notifies manager about all events from this listener.
if (verChanged) {
- DiscoCache cache = new DiscoCache(locNode, F.view(topSnapshot,
- F.remoteVerifiedNodes(locNode.id())));
+ DiscoCache cache = new DiscoCache(locNode, F.view(topSnapshot, F.remoteNodes(locNode.id())));
discoCacheHist.put(nextTopVer, cache);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c73d162/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f457d6c..46a23d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -8048,9 +8048,13 @@ public abstract class IgniteUtils {
public static String consistentId(Collection<String> addrs, int port) {
assert !F.isEmpty(addrs);
+ List<String> sortedAddrs = new ArrayList<>(addrs);
+
+ Collections.sort(sortedAddrs);
+
StringBuilder sb = new StringBuilder();
- for (String addr : addrs)
+ for (String addr : sortedAddrs)
sb.append(addr).append(',');
sb.delete(sb.length() - 1, sb.length());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c73d162/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index d04190a..6f544e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -332,22 +332,6 @@ public class GridFunc {
}
/**
- * Gets predicate that evaluates to {@code false} for given local node ID and unverified nodes - who hasn't
- * received order ID from the coordinator.
- *
- * @param locNodeId Local node ID.
- * @param <T> Type of the node.
- * @return Return {@code false} for the given local node ID.
- */
- public static <T extends ClusterNode> IgnitePredicate<T> remoteVerifiedNodes(final UUID locNodeId) {
- return new P1<T>() {
- @Override public boolean apply(T n) {
- return n.order() > 0 && !n.id().equals(locNodeId);
- }
- };
- }
-
- /**
* Creates new collection by removing duplicates from the given collection.
*
* @param c Collection to remove duplicates from.