You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/04/10 09:46:44 UTC
[13/27] incubator-ignite git commit: IGNITE-712 - Client disco fix
IGNITE-712 - Client disco fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/12a914d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/12a914d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/12a914d0
Branch: refs/heads/ignite-714
Commit: 12a914d015af124232d1505fb587b7c2a79b6591
Parents: 06746ea
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Thu Apr 9 16:13:46 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Thu Apr 9 16:13:46 2015 -0700
----------------------------------------------------------------------
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 3 ++-
.../apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java | 2 ++
.../ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12a914d0/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 04ff423..b8d7616 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
@@ -2433,7 +2433,8 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
* @return {@code True} if cache is accessible on the given node.
*/
public boolean cacheNode(ClusterNode node) {
- return !node.isDaemon() && (cacheFilter.apply(node) || clientNodes.containsKey(node.id()));
+ return !node.isClient() && !node.isDaemon() &&
+ (cacheFilter.apply(node) || clientNodes.containsKey(node.id()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12a914d0/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index 465bfb9..2258e27 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -883,6 +883,8 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
Collection<TcpDiscoveryNode> top = msg.topology();
if (top != null) {
+ gridStartTime = msg.gridStartTime();
+
for (TcpDiscoveryNode n : top) {
if (n.order() > 0)
n.visible(true);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/12a914d0/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java
index 498ed6f..91e79f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySelfTest.java
@@ -420,7 +420,7 @@ public class TcpClientDiscoverySelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
- public void _testDataExchangeFromServer() throws Exception {
+ public void testDataExchangeFromServer() throws Exception {
testDataExchange("server-0");
}