Repository: incubator-ignite Updated Branches: refs/heads/ignite-747 b437ec73d -> b1c7e302d
ignite-747: enabling tests, adding asserts Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b1c7e302 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b1c7e302 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b1c7e302 Branch: refs/heads/ignite-747 Commit: b1c7e302da3689a7e6c67cfe9b3370dc286e2da6 Parents: b437ec7 Author: Denis Magda <[email protected]> Authored: Thu Jul 2 16:41:50 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Thu Jul 2 16:41:50 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 ++ .../ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java | 2 +- .../replicated/GridCacheReplicatedNodeRestartSelfTest.java | 3 ++- .../IgniteCacheAtomicReplicatedNodeRestartSelfTest.java | 3 ++- 4 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1c7e302/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 94a2290..3cc6658 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 @@ -3137,6 +3137,8 @@ class ServerImpl extends TcpDiscoveryImpl { if (msg.verified() && locNodeId.equals(nodeId) && spiStateCopy() == CONNECTING) { assert node != null; + assert topVer > 0 : "Invalid topology version: " + msg; + ring.topologyVersion(topVer); node.order(topVer); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1c7e302/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java index 36ae39e..4b4df45 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNode.java @@ -300,7 +300,7 @@ public class TcpDiscoveryNode extends GridMetadataAwareAdapter implements Cluste * @param order Order of the node. */ public void order(long order) { - assert order >= 0 : "Order is invalid: " + this; + assert order > 0 : "Order is invalid: " + this; this.order = order; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1c7e302/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java index dfdfd7e..45dc4d6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedNodeRestartSelfTest.java @@ -30,7 +30,8 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; public class GridCacheReplicatedNodeRestartSelfTest extends GridCacheAbstractNodeRestartSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-882";); + super.beforeTest(); +// fail("https://issues.apache.org/jira/browse/IGNITE-882";); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b1c7e302/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java index 379ed65..58d43da 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java @@ -27,7 +27,8 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheReplicatedNodeRestartSelfTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-747";); + super.beforeTest(); + //fail("https://issues.apache.org/jira/browse/IGNITE-747";); } /** {@inheritDoc} */
