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 2017/03/07 14:39:10 UTC
[3/3] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-4705-2' into ignite-4705-debug
Merge remote-tracking branch 'remotes/origin/ignite-4705-2' into ignite-4705-debug
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35f23478
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35f23478
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35f23478
Branch: refs/heads/ignite-4705-debug
Commit: 35f23478192e2d1393fc6f4a7db7a674d6a1bfa9
Parents: 3774046 28d4779
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 7 17:37:09 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 7 17:37:09 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheIoManager.java | 8 ++
.../dht/atomic/GridDhtAtomicCache.java | 14 ++-
.../GridNearAtomicAbstractUpdateFuture.java | 41 +++++--
.../GridNearAtomicAbstractUpdateRequest.java | 8 ++
.../GridNearAtomicSingleUpdateFuture.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 8 +-
.../atomic/GridNearAtomicUpdateResponse.java | 24 ++--
.../atomic/IgniteCacheAtomicProtocolTest.java | 116 +++++++++++++++++++
8 files changed, 196 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35f23478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35f23478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/35f23478/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index fccb23d,f69d31d..ab690da
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@@ -150,10 -146,8 +150,10 @@@ public class GridNearAtomicSingleUpdate
return false;
if (reqState.req.nodeId.equals(nodeId)) {
- GridNearAtomicAbstractUpdateRequest req = reqState.processPrimaryResponse(nodeId);
+ GridNearAtomicAbstractUpdateRequest req = reqState.onPrimaryFail();
+ TestDebugLog.addEntryMessage(key, nodeId, "node left, primary");
+
if (req != null) {
GridNearAtomicUpdateResponse res = primaryFailedResponse(req);