Repository: ignite Updated Branches: refs/heads/ignite-1183 088c9bfd9 -> fa71ebb2b
ignite-1183 Fixed data structures create/destroy from client node Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fa71ebb2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fa71ebb2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fa71ebb2 Branch: refs/heads/ignite-1183 Commit: fa71ebb2b1ce20be5205ebe57cee53ec97e52938 Parents: 088c9bf Author: sboikov <[email protected]> Authored: Thu Oct 8 14:21:38 2015 +0300 Committer: sboikov <[email protected]> Committed: Thu Oct 8 14:21:38 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 8 ++++++-- .../processors/datastructures/DataStructuresProcessor.java | 9 ++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fa71ebb2/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 41df53a..97aa646 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 @@ -585,8 +585,12 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> if (req != null) { res = new GridNearAtomicUpdateResponse(cctx.cacheId(), nodeId, req.futureVersion()); - res.addFailedKeys(req.keys(), new ClusterTopologyCheckedException("Primary node left grid before " + - "response is received: " + nodeId)); + ClusterTopologyCheckedException e = new ClusterTopologyCheckedException("Primary node left grid " + + "before response is received: " + nodeId); + + e.retryReadyFuture(cctx.shared().nextAffinityReadyFuture(req.topologyVersion())); + + res.addFailedKeys(req.keys(), e); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/fa71ebb2/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 8ff35f0..7c5e97c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -516,7 +516,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { IgniteInternalFuture<?> fut = topErr.retryReadyFuture(); - fut.get(); + if (fut != null) + fut.get(); } } } @@ -609,7 +610,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { IgniteInternalFuture<?> fut = topErr.retryReadyFuture(); - fut.get(); + if (fut != null) + fut.get(); } } } @@ -1016,7 +1018,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { IgniteInternalFuture<?> fut = topErr.retryReadyFuture(); - fut.get(); + if (fut != null) + fut.get(); } } }
