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:34 UTC
[38/40] incubator-ignite git commit: ignite-747: fixed invalid order
ignite-747: fixed invalid order
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f685e3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f685e3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f685e3e
Branch: refs/heads/ignite-747
Commit: 8f685e3e10925f8159dfd1a9ccd899d89220fa39
Parents: 1168cbc
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 7 10:38:22 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 7 10:38:22 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +-
.../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f685e3e/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 3cc6658..701db69 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -2857,7 +2857,7 @@ class ServerImpl extends TcpDiscoveryImpl {
}
if (msg.verified() && !locNodeId.equals(node.id())) {
- if (node.internalOrder() <= ring.maxInternalOrder()) {
+ if (node.internalOrder() <= ring.maxInternalOrder() && spiState != STOPPING) {
if (log.isDebugEnabled())
log.debug("Discarding node added message since new node's order is less than " +
"max order in ring [ring=" + ring + ", node=" + node + ", locNode=" + locNode +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f685e3e/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
index 013c8c9..2b1fbf6 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java
@@ -130,10 +130,10 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
/**
* @throws Exception If any error occurs.
*/
- public void testMultipleStart() throws Exception{
+ public void testMultipleStartOnCoordinatorStop() throws Exception{
startGrids(GRID_CNT);
- final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT + 10);
+ final CyclicBarrier barrier = new CyclicBarrier(GRID_CNT + 4);
final AtomicInteger startIdx = new AtomicInteger(GRID_CNT);
@@ -149,7 +149,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest {
return null;
}
- }, GRID_CNT + 10, "start-thread");
+ }, GRID_CNT + 3, "start-thread");
barrier.await();