Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@ignite.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: yzhdanov@apache.org
To: commits@ignite.apache.org
Date: Wed, 11 Jan 2017 14:21:51 -0000
Message-Id: <2191009e00bb48bea4b5e3ff0c2e5fef@git.apache.org>
In-Reply-To: <881941b3db1c45568f15550ced17eaed@git.apache.org>
References: <881941b3db1c45568f15550ced17eaed@git.apache.org>
Subject: [8/9] ignite git commit: completing from user thread
archived-at: Wed, 11 Jan 2017 14:21:47 -0000

completing from user thread


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

Branch: refs/heads/ignite-comm-balance-master
Commit: 3cc6c2954a2102e06583f92ed84eccac9d096bff
Parents: 8f98e62
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Jan 11 17:21:07 2017 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Jan 11 17:21:07 2017 +0300

----------------------------------------------------------------------
 .../managers/communication/GridIoManager.java   | 35 +++++++++++++++-----
 1 file changed, 26 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3cc6c295/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index d50a5be..56cefdf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -40,7 +40,6 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteSystemProperties;
 import org.apache.ignite.cluster.ClusterNode;
 import org.apache.ignite.events.DiscoveryEvent;
 import org.apache.ignite.events.Event;
@@ -68,6 +67,7 @@ import org.apache.ignite.internal.util.lang.GridTuple3;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.lang.IgniteBiPredicate;
@@ -315,7 +315,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         if (log.isDebugEnabled())
             log.debug(startInfo());
 
-        U.debug(log, "COMPLETE_IN_USER_THREAD: " + COMPLETE_IN_USER_THREAD);
+        U.debug(log, "COMPLETE_IN_USER_THREAD for cache ID: " + COMPLETE_IN_USER_THREAD_ID);
 
         addMessageListener(GridTopic.TOPIC_IO_TEST, new GridMessageListener() {
             @Override public void onMessage(UUID nodeId, Object msg) {
@@ -764,7 +764,20 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         }
     }
 
-    private static final boolean COMPLETE_IN_USER_THREAD = IgniteSystemProperties.getBoolean("COMPLETE_IN_USER_THREAD", false);
+    private static final int COMPLETE_IN_USER_THREAD_ID;
+
+    static {
+        String cacheName = System.getProperty("COMPLETE_IN_USER_THREAD");
+
+        if (cacheName == null)
+            COMPLETE_IN_USER_THREAD_ID = 0;
+        else {
+            COMPLETE_IN_USER_THREAD_ID = CU.cacheId(cacheName);
+
+            if (COMPLETE_IN_USER_THREAD_ID == 0)
+                throw new RuntimeException();
+        }
+    }
 
     /**
      * @param nodeId Node ID.
@@ -809,17 +822,21 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             return;
         }
 
-        if (COMPLETE_IN_USER_THREAD && msg.message() instanceof GridNearAtomicUpdateResponse) {
+        if (COMPLETE_IN_USER_THREAD_ID != 0 &&
+            msg.message().directType() == 41 // instanceof GridNearAtomicUpdateResponse
+            ) {
             GridNearAtomicUpdateResponse res = (GridNearAtomicUpdateResponse)msg.message();
 
-            GridNearAtomicAbstractUpdateFuture f =
-                (GridNearAtomicAbstractUpdateFuture)ctx.cache().context().mvcc().atomicFuture(res.futureVersion());
+            if (res.cacheId() == COMPLETE_IN_USER_THREAD_ID) {
+                GridNearAtomicAbstractUpdateFuture f =
+                    (GridNearAtomicAbstractUpdateFuture)ctx.cache().context().mvcc().atomicFuture(res.futureVersion());
 
-            f.completer(c);
+                f.completer(c);
 
-            f.unblockAllThreads();
+                f.unblockAllThreads();
 
-            return;
+                return;
+            }
         }
 
         if (ctx.config().getStripedPoolSize() > 0 &&