IGNITE-621 - Fixing tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0cb2d97c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0cb2d97c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0cb2d97c Branch: refs/heads/ignite-950 Commit: 0cb2d97c61603017909ff6ffc4908f93b2384ec0 Parents: d24658d Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Mon Jun 29 17:39:42 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Mon Jun 29 17:39:42 2015 -0700 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 3 --- .../dht/atomic/GridNearAtomicUpdateFuture.java | 23 ++++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb2d97c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 37b57e6..4b1a58f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -146,9 +146,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> GridDhtAtomicUpdateRequest req = mappings.get(nodeId); if (req != null) { - updateRes.addFailedKeys(req.keys(), new ClusterTopologyCheckedException("Failed to write keys on backup " + - "(node left grid before response is received): " + nodeId)); - // Remove only after added keys to failed set. mappings.remove(nodeId); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cb2d97c/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 ea9b335..41cc400 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 @@ -328,12 +328,8 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> else { topLocked = true; - synchronized (this) { - this.topVer = topVer; - - // Cannot remap. - remapCnt.set(1); - } + // Cannot remap. + remapCnt.set(1); map0(topVer, null, false, null); } @@ -452,6 +448,9 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> CachePartialUpdateCheckedException cause = X.cause(err, CachePartialUpdateCheckedException.class); + if (F.isEmpty(cause.failedKeys())) + cause.printStackTrace(); + remap(cause.failedKeys()); return false; @@ -609,10 +608,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> return; } - - synchronized (this) { - this.topVer = topVer; - } } finally { cache.topology().readUnlock(); @@ -786,7 +781,11 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> conflictVer, true); - single = true; + synchronized (this) { + this.topVer = topVer; + + single = true; + } // Optimize mapping for single key. mapSingle(primary.id(), req); @@ -942,6 +941,8 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> } } + this.topVer = topVer; + fastMapRemap = false; }
