ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: 5578
Date Mon, 31 Jul 2017 09:28:34 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578 379fa8fc9 -> 413bb093f


5578


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/413bb093
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/413bb093
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/413bb093

Branch: refs/heads/ignite-5578
Commit: 413bb093fb85f46714576072f0a78af1fbfac23b
Parents: 379fa8f
Author: sboikov <sboikov@gridgain.com>
Authored: Mon Jul 31 12:28:28 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Mon Jul 31 12:28:28 2017 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/atomic/GridDhtAtomicCache.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/413bb093/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index bacb89b..0f9b609 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1794,7 +1794,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
 
                     GridDhtTopologyFuture topFut = top.topologyVersionFuture();
 
-                    if (!topFut.isDone())
+                    if (!req.topologyLocked() && !topFut.isDone())
                         return false; // Will wait at the beginning of next updateAllAsyncInternal0
call.
 
                     // Do not check topology version if topology was locked on near node
by
@@ -1889,12 +1889,15 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K,
V> {
     private boolean waitForTopologyFuture(final ClusterNode node,
         final GridNearAtomicAbstractUpdateRequest req,
         final UpdateReplyClosure completionCb) {
+        if (req.topologyLocked())
+            return false;
+
         GridDhtTopologyFuture topFut = ctx.group().topology().topologyVersionFuture();
 
         if (!topFut.isDone()) {
             Thread curThread = Thread.currentThread();
 
-            if (!req.topologyLocked() && (curThread instanceof IgniteThread)) {
+            if (curThread instanceof IgniteThread) {
                 final IgniteThread thread = (IgniteThread)curThread;
 
                 if (thread.hasStripeOrPolicy()) {


Mime
View raw message