Repository: incubator-ignite Updated Branches: refs/heads/ignite-1095 [created] 2df9101e3
# ignite-1095 guard from concurrent remap Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2df9101e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2df9101e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2df9101e Branch: refs/heads/ignite-1095 Commit: 2df9101e3e33a93be49f67820cbc0c0647172739 Parents: aa2d7cb Author: sboikov <[email protected]> Authored: Tue Jul 14 11:15:15 2015 +0300 Committer: sboikov <[email protected]> Committed: Tue Jul 14 11:15:15 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 6 ++++-- ...niteCacheAtomicReplicatedNodeRestartSelfTest.java | 15 --------------- 2 files changed, 4 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2df9101e/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 41cc400..cb1d16f 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 @@ -358,8 +358,10 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> * @param failed Keys to remap. */ private void remap(Collection<?> failed) { - if (futVer != null) - cctx.mvcc().removeAtomicFuture(version()); + GridCacheVersion futVer0 = futVer; + + if (futVer0 == null || cctx.mvcc().removeAtomicFuture(futVer0) == null) + return; Collection<Object> remapKeys = new ArrayList<>(failed.size()); Collection<Object> remapVals = vals != null ? new ArrayList<>(failed.size()) : null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2df9101e/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 b4ed18d..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,21 +26,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*; */ public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheReplicatedNodeRestartSelfTest { /** {@inheritDoc} */ - @Override public void testRestartWithPutSixNodesTwoBackups() throws Throwable { - fail("https://issues.apache.org/jira/browse/IGNITE-1095";); - } - - /** {@inheritDoc} */ - @Override public void testRestartWithPutEightNodesTwoBackups() throws Throwable { - fail("https://issues.apache.org/jira/browse/IGNITE-1095";); - } - - /** {@inheritDoc} */ - @Override public void testRestartWithPutTenNodesTwoBackups() throws Throwable { - fail("https://issues.apache.org/jira/browse/IGNITE-1095";); - } - - /** {@inheritDoc} */ @Override protected CacheAtomicityMode atomicityMode() { return ATOMIC; }
