ignite-1758 Discovery fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87621a98 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87621a98 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87621a98 Branch: refs/heads/ignite-1758-debug Commit: 87621a989d437e02c0bcd19781091dfe96da6af6 Parents: eaf135a Author: sboikov <[email protected]> Authored: Fri Nov 13 10:26:22 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Nov 13 10:26:22 2015 +0300 ---------------------------------------------------------------------- .../tcp/messages/TcpDiscoveryAbstractMessage.java | 1 - .../ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/87621a98/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java index be0ff8c..9cb47af 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java @@ -27,7 +27,6 @@ import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; -import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; import org.jetbrains.annotations.Nullable; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/87621a98/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java index 8b94f54..7beeb41 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryRestartTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.Event; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -196,8 +197,15 @@ public class TcpDiscoveryRestartTest extends GridCommonAbstractTest { /** * @param nodeId Node ID. + * @throws Exception If failed. */ - void checkEvents(UUID nodeId) { + void checkEvents(final UUID nodeId) throws Exception { + GridTestUtils.waitForCondition(new GridAbsPredicate() { + @Override public boolean apply() { + return joinIds.contains(nodeId) && leftIds.contains(nodeId); + } + }, 5000); + assertTrue("No join event: " + nodeId, joinIds.contains(nodeId)); assertTrue("No left event: " + nodeId, leftIds.contains(nodeId));
