Repository: ignite Updated Branches: refs/heads/ignite-1124-debug [created] 7a55cc655
ignite-1124-debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7a55cc65 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7a55cc65 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7a55cc65 Branch: refs/heads/ignite-1124-debug Commit: 7a55cc65501df9ba049f5a0cacce151b65064924 Parents: a03584a Author: sboikov <[email protected]> Authored: Tue Aug 25 14:49:36 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Aug 25 14:49:36 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- ...niteCacheAtomicReplicatedNodeRestartSelfTest.java | 5 ----- .../testsuites/IgniteCacheRestartTestSuite.java | 15 +++++---------- 3 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7a55cc65/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 07ec808..50493a6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -715,7 +715,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> return; } - if (futVer == null) + if (!remap && futVer == null) // Assign future version in topology read lock before first exception may be thrown. futVer = cctx.versions().next(topVer); http://git-wip-us.apache.org/repos/asf/ignite/blob/7a55cc65/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 68c7fbb..f556023 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 @@ -26,11 +26,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheReplicatedNodeRestartSelfTest { /** {@inheritDoc} */ - @Override protected void beforeTestsStarted() throws Exception { - fail("https://issues.apache.org/jira/browse/IGNITE-1124";); - } - - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7a55cc65/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java index 29c981e..d04f941 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java @@ -35,17 +35,12 @@ public class IgniteCacheRestartTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Cache Restart Test Suite"); - suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); - suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); - suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest.class); - - suite.addTestSuite(IgniteCacheAtomicNodeRestartTest.class); suite.addTestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class); - - suite.addTestSuite(IgniteCacheAtomicPutAllFailoverSelfTest.class); - suite.addTestSuite(IgniteCachePutAllRestartTest.class); - suite.addTestSuite(GridCachePutAllFailoverSelfTest.class); + suite.addTestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class); + suite.addTestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class); + suite.addTestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class); + suite.addTestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class); + suite.addTestSuite(IgniteCacheAtomicReplicatedNodeRestartSelfTest.class); return suite; }
