You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/15 07:13:08 UTC
[6/7] ignite git commit: ignite-1.5
ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/96358d4d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/96358d4d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/96358d4d
Branch: refs/heads/ignite-1537
Commit: 96358d4d7108d33b761e4d3a0a201aa1a46533d6
Parents: 29e8e8b
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 15 09:11:31 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 15 09:11:31 2015 +0300
----------------------------------------------------------------------
.../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 6 +++---
.../processors/cache/distributed/near/GridNearAtomicCache.java | 3 +++
.../cache/IgniteCacheAtomicPutAllFailoverSelfTest.java | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/96358d4d/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 aee3d36..b384bab 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
@@ -589,7 +589,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
else
req = mappings != null ? mappings.get(nodeId) : null;
- if (req != null) {
+ if (req != null && req.response() == null) {
res = new GridNearAtomicUpdateResponse(cctx.cacheId(), nodeId, req.futureVersion(),
cctx.deploymentEnabled());
@@ -848,6 +848,8 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
assert futVer == null : this;
assert this.topVer == AffinityTopologyVersion.ZERO : this;
+ resCnt = 0;
+
this.topVer = topVer;
futVer = cctx.versions().next(topVer);
@@ -891,8 +893,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
mappings = new HashMap<>(pendingMappings);
assert !mappings.isEmpty() || size == 0 : GridNearAtomicUpdateFuture.this;
-
- resCnt = 0;
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/96358d4d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 06898cd..a2d5adb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -130,6 +130,9 @@ public class GridNearAtomicCache<K, V> extends GridNearCacheAdapter<K, V> {
GridNearAtomicUpdateRequest req,
GridNearAtomicUpdateResponse res
) {
+ if (F.size(res.failedKeys()) == req.keys().size())
+ return;
+
/*
* Choose value to be stored in near cache: first check key is not in failed and not in skipped list,
* then check if value was generated on primary node, if not then use value sent in request.
http://git-wip-us.apache.org/repos/asf/ignite/blob/96358d4d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
index b3464b8..3f9fc5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAtomicPutAllFailoverSelfTest.java
@@ -30,6 +30,7 @@ public class IgniteCacheAtomicPutAllFailoverSelfTest extends GridCachePutAllFail
return ATOMIC;
}
+ /** {@inheritDoc} */
@Override public void testPutAllFailoverColocatedNearEnabledTwoBackupsOffheapTieredSwap(){
fail("https://issues.apache.org/jira/browse/IGNITE-1584");
}