ignite-890: fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/86b85455 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86b85455 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86b85455 Branch: refs/heads/ignite-884 Commit: 86b85455fcfb03958acf1db7cca4c62179989c2e Parents: baeb924 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Jul 14 15:50:02 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Jul 14 15:50:02 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 8 +++++--- .../spi/discovery/tcp/TcpDiscoveryMultiThreadedTest.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86b85455/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 838b89a..3f05f59 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -594,9 +594,11 @@ class ClientImpl extends TcpDiscoveryImpl { NavigableSet<ClusterNode> allNodes = allVisibleNodes(); if (!topHist.containsKey(topVer)) { - if (!topHist.isEmpty() && topHist.lastKey() != topVer - 1) - log.warning("Missing particular topology version [lastVer=" + (topHist.isEmpty() ? null : - topHist.lastKey()) + ", newVer=" + topVer + ", locNode=" + locNode + ", msg=" + msg); + assert topHist.isEmpty() || topHist.lastKey() == topVer - 1 : + "lastVer=" + (topHist.isEmpty() ? null : topHist.lastKey()) + + ", newVer=" + topVer + + ", locNode=" + locNode + + ", msg=" + msg; topHist.put(topVer, allNodes); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86b85455/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 fa70828..9643235 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 @@ -146,7 +146,7 @@ public class TcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { */ public void testMultiThreadedClientsServersRestart() throws Exception { fail("https://issues.apache.org/jira/browse/IGNITE-1123";); - + clientFlagGlobal = false; info("Test timeout: " + (getTestTimeout() / (60 * 1000)) + " min.");
