Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD645185A9 for ; Thu, 16 Jul 2015 09:29:05 +0000 (UTC) Received: (qmail 9073 invoked by uid 500); 16 Jul 2015 09:29:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 9041 invoked by uid 500); 16 Jul 2015 09:29:04 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 8995 invoked by uid 99); 16 Jul 2015 09:29:04 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2015 09:29:04 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id C97E4D50B0 for ; Thu, 16 Jul 2015 09:29:03 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.484 X-Spam-Level: X-Spam-Status: No, score=0.484 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-1.317, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id k6a8itbnTGNv for ; Thu, 16 Jul 2015 09:28:48 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id A7CBD2C6C3 for ; Thu, 16 Jul 2015 09:28:25 +0000 (UTC) Received: (qmail 3229 invoked by uid 99); 16 Jul 2015 09:28:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Jul 2015 09:28:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 640D5E361C; Thu, 16 Jul 2015 09:28:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Thu, 16 Jul 2015 09:29:09 -0000 Message-Id: <56b39553d2914e2e87569320bd09be3c@git.apache.org> In-Reply-To: <677bb3be7da44ff191c0583d0646d3ed@git.apache.org> References: <677bb3be7da44ff191c0583d0646d3ed@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [46/50] [abbrv] incubator-ignite git commit: # ignite-1095 guard from concurrent remap (cherry picked from commit b19ed0c) # ignite-1095 guard from concurrent remap (cherry picked from commit b19ed0c) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24f8961c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24f8961c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24f8961c Branch: refs/heads/ignite-gg-9615 Commit: 24f8961c098534beb399dbeee7dfd61e053c3f2e Parents: d5ed494 Author: sboikov Authored: Tue Jul 14 16:55:49 2015 +0300 Committer: sboikov Committed: Tue Jul 14 16:40:58 2015 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 4 ++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 20 +++++++++++++++----- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 15 --------------- 4 files changed, 18 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24f8961c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java index 1670994..96e6edc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java @@ -142,7 +142,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { } // Request should be for primary keys only in PRIMARY ordering mode. - assert req.hasPrimary(); + assert req.hasPrimary() : req; if (req.writeSynchronizationMode() != FULL_ASYNC) sendNearUpdateReply(res.nodeId(), res); @@ -2158,7 +2158,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { */ private void unlockEntries(Collection locked, AffinityTopologyVersion topVer) { // Process deleted entries before locks release. - assert ctx.deferredDelete(); + assert ctx.deferredDelete() : this; // Entries to skip eviction manager notification for. // Enqueue entries while holding locks. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24f8961c/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..751c9ba 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 * @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 remapKeys = new ArrayList<>(failed.size()); Collection remapVals = vals != null ? new ArrayList<>(failed.size()) : null; @@ -444,6 +446,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter if (err != null && X.hasCause(err, CachePartialUpdateCheckedException.class) && X.hasCause(err, ClusterTopologyCheckedException.class) && + storeFuture() && remapCnt.decrementAndGet() > 0) { CachePartialUpdateCheckedException cause = X.cause(err, CachePartialUpdateCheckedException.class); @@ -646,6 +649,13 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter } /** + * @return {@code True} future is stored by {@link GridCacheMvccManager#addAtomicFuture}. + */ + private boolean storeFuture() { + return cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC; + } + + /** * @param topVer Topology version. * @param remapKeys Keys to remap or {@code null} to map all keys. * @param remap Flag indicating if this is partial remap for this future. @@ -671,7 +681,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter // Assign future version in topology read lock before first exception may be thrown. futVer = cctx.versions().next(topVer); - if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC)) + if (!remap && storeFuture()) cctx.mvcc().addAtomicFuture(version(), this); CacheConfiguration ccfg = cctx.config(); @@ -998,7 +1008,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter new CI2() { @Override public void apply(GridNearAtomicUpdateRequest req, GridNearAtomicUpdateResponse res) { - assert res.futureVersion().equals(futVer); + assert res.futureVersion().equals(futVer) : futVer; onResult(res.nodeId(), res); } @@ -1065,7 +1075,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter new CI2() { @Override public void apply(GridNearAtomicUpdateRequest req, GridNearAtomicUpdateResponse res) { - assert res.futureVersion().equals(futVer); + assert res.futureVersion().equals(futVer) : futVer; onResult(res.nodeId(), res); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24f8961c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java index 8e69853..d3bcf67 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java @@ -269,7 +269,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA return null; } - }, 4); + }, 4, "putAll-thread"); Random rnd = new Random(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24f8961c/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; }