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/20 09:06:21 UTC
ignite git commit: tmp
Repository: ignite
Updated Branches:
refs/heads/ignite-4680-sb e59edc930 -> d43d73d32
tmp
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d43d73d3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d43d73d3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d43d73d3
Branch: refs/heads/ignite-4680-sb
Commit: d43d73d323277bbebe6180357f488cc9ef2eebde
Parents: e59edc9
Author: sboikov <sb...@gridgain.com>
Authored: Mon Mar 20 11:55:59 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Mon Mar 20 12:05:59 2017 +0300
----------------------------------------------------------------------
.../dht/atomic/GridNearAtomicAbstractUpdateFuture.java | 5 +----
.../java/org/apache/ignite/internal/util/StripedExecutor.java | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d43d73d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 2d02795..90c51f6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -522,10 +522,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt
* @return {@code True} if all expected responses are received.
*/
private boolean finished() {
- if (req.writeSynchronizationMode() == PRIMARY_SYNC)
- return hasRes;
-
- return (dhtNodes != null && dhtNodes.isEmpty()) && hasRes;
+ return hasRes; // FIXME tmp.
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/d43d73d3/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
index 28bb584..d4e16e8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/StripedExecutor.java
@@ -624,7 +624,7 @@ public class StripedExecutor implements ExecutorService {
if (r != null)
return r;
- parkCntr++;
+ //parkCntr++;
LockSupport.park();
if (Thread.interrupted())
@@ -641,7 +641,7 @@ public class StripedExecutor implements ExecutorService {
queue.add(cmd);
if (parked) {
- unparkCntr.increment();
+ //unparkCntr.increment();
LockSupport.unpark(thread);
}
}