You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/02 16:54:06 UTC
[1/3] incubator-ignite git commit: # IGNITE-709 Improve nodeId
generation in tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709_2 71bf90983 -> 4903dcec4
# IGNITE-709 Improve nodeId generation in tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e69803bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e69803bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e69803bd
Branch: refs/heads/ignite-709_2
Commit: e69803bddd8b7243ea7359064c0eea178cf2cb2c
Parents: 71bf909
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat May 2 17:03:46 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat May 2 17:03:46 2015 +0300
----------------------------------------------------------------------
.../tcp/TcpClientDiscoverySelfTest.java | 47 +++++++++++++++++---
1 file changed, 42 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e69803bd/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 09cbd97..5811ba0 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
@@ -111,6 +111,12 @@ public class TcpClientDiscoverySelfTest extends GridCommonAbstractTest {
disco.setIpFinder(ipFinder);
cfg.setDiscoverySpi(disco);
+
+ String nodeId = cfg.getNodeId().toString();
+
+ nodeId = "cc" + nodeId.substring(2);
+
+ cfg.setNodeId(UUID.fromString(nodeId));
}
return cfg;
@@ -285,7 +291,7 @@ public class TcpClientDiscoverySelfTest extends GridCommonAbstractTest {
checkNodes(3, 3);
- resetClientIpFinder(2);
+ setClientRouter(2, 0);
srvFailedLatch = new CountDownLatch(2);
clientFailedLatch = new CountDownLatch(3);
@@ -303,6 +309,32 @@ public class TcpClientDiscoverySelfTest extends GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+ public void testClientSegmentation() throws Exception {
+ clientsPerSrv = 1;
+
+ startServerNodes(3);
+ startClientNodes(3);
+
+ checkNodes(3, 3);
+
+// setClientRouter(2, 2);
+
+ srvFailedLatch = new CountDownLatch(2 + 2);
+ clientFailedLatch = new CountDownLatch(2 + 2);
+
+ attachListeners(2, 2);
+
+ failServer(2);
+
+ await(srvFailedLatch);
+ await(clientFailedLatch);
+
+ checkNodes(2, 2);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
public void testClientNodeJoinOneServer() throws Exception {
startServerNodes(1);
@@ -317,6 +349,11 @@ public class TcpClientDiscoverySelfTest extends GridCommonAbstractTest {
checkNodes(1, 1);
}
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return Long.MAX_VALUE;
+ }
+
/**
* @throws Exception If failed.
*/
@@ -473,16 +510,16 @@ public class TcpClientDiscoverySelfTest extends GridCommonAbstractTest {
}
/**
- * @param idx Index.
+ * @param clientIdx Index.
* @throws Exception In case of error.
*/
- private void resetClientIpFinder(int idx) throws Exception {
+ private void setClientRouter(int clientIdx, int srvIdx) throws Exception {
TcpClientDiscoverySpi disco =
- (TcpClientDiscoverySpi)G.ignite("client-" + idx).configuration().getDiscoverySpi();
+ (TcpClientDiscoverySpi)G.ignite("client-" + clientIdx).configuration().getDiscoverySpi();
TcpDiscoveryVmIpFinder ipFinder = (TcpDiscoveryVmIpFinder)disco.getIpFinder();
- String addr = IP_FINDER.getRegisteredAddresses().iterator().next().toString();
+ String addr = new ArrayList<>(IP_FINDER.getRegisteredAddresses()).get(srvIdx).toString();
if (addr.startsWith("/"))
addr = addr.substring(1);
[2/3] incubator-ignite git commit: # IGNITE-709 Remove unnecessary
empty constructor.
Posted by se...@apache.org.
# IGNITE-709 Remove unnecessary empty constructor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/87cb5ce5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/87cb5ce5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/87cb5ce5
Branch: refs/heads/ignite-709_2
Commit: 87cb5ce5e47821acc729f2540e06628b23aa5df5
Parents: e69803b
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat May 2 17:45:31 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat May 2 17:45:31 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/87cb5ce5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
index 217a5da..4ade1b6 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryPingResponse.java
@@ -33,13 +33,6 @@ public class TcpDiscoveryPingResponse extends TcpDiscoveryAbstractMessage {
private boolean clientExists;
/**
- * For {@link Externalizable}.
- */
- public TcpDiscoveryPingResponse() {
- // No-op.
- }
-
- /**
* @param creatorNodeId Creator node ID.
*/
public TcpDiscoveryPingResponse(UUID creatorNodeId) {
[3/3] incubator-ignite git commit: # IGNITE-709 Fix
TcpClientDiscoverySelfTest#testClientNodeLeaveOneServer().
Posted by se...@apache.org.
# IGNITE-709 Fix TcpClientDiscoverySelfTest#testClientNodeLeaveOneServer().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4903dcec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4903dcec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4903dcec
Branch: refs/heads/ignite-709_2
Commit: 4903dcec4270eccf2756ba4e693b1484f796e3d4
Parents: 87cb5ce
Author: sevdokimov <se...@jetbrains.com>
Authored: Sat May 2 17:53:56 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Sat May 2 17:53:56 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4903dcec/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index ba67ca7..eaf0857 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -1167,7 +1167,7 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
UUID locNodeId = getLocalNodeId();
if (F.contains(locNodeAddrs, addr))
- return F.t(getLocalNodeId(), false);
+ return F.t(getLocalNodeId(), clientNodeId != null && clientMsgWorkers.containsKey(clientNodeId));
GridFutureAdapter<IgniteBiTuple<UUID, Boolean>> fut = new GridFutureAdapter<>();