Repository: ignite Updated Branches: refs/heads/ignite-1.5-atomic-opt 42571c1d8 -> 81b600de5
Debugging slowdowns Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/81b600de Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/81b600de Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/81b600de Branch: refs/heads/ignite-1.5-atomic-opt Commit: 81b600de52e5fb023e16e6bffd56c4d14a4a770f Parents: 42571c1 Author: Yakov Zhdanov <[email protected]> Authored: Tue Nov 10 13:18:32 2015 +0300 Committer: Yakov Zhdanov <[email protected]> Committed: Tue Nov 10 13:18:32 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 4 +++- .../apache/ignite/internal/processors/task/GridTaskWorker.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/81b600de/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 0159290..c34dcfd 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 @@ -159,7 +159,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> * @return {@code True} if request found. */ private boolean registerResponse(UUID nodeId) { - int resCnt0 = -1; + int resCnt0; GridDhtAtomicUpdateRequest req = mappings.get(nodeId); @@ -370,6 +370,8 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> } } } + else + onDone(); // Send response right away if no ACKs from backup is required. // Backups will send ACKs anyway, future will be completed after all backups have replied. http://git-wip-us.apache.org/repos/asf/ignite/blob/81b600de/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java index cbbde7d..6876b0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java @@ -1126,6 +1126,9 @@ class GridTaskWorker<T, R> extends GridWorker implements GridTimeoutObject { } } + if (doomed == null) + return; + // Send cancellation request to all unfinished children. for (GridJobResultImpl res : doomed) { UUID nodeId = res.getNode().id();
