ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject ignite git commit: completing from user thread
Date Wed, 11 Jan 2017 10:36:39 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-comm-balance-master 69eac481d -> 3fe7dfba2


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/3fe7dfba
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3fe7dfba
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3fe7dfba

Branch: refs/heads/ignite-comm-balance-master
Commit: 3fe7dfba2ee8adcd79f67a07e9fec986bc2b714e
Parents: 69eac48
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Wed Jan 11 13:36:27 2017 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Wed Jan 11 13:36:27 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/managers/communication/GridIoManager.java | 7 ++++++-
 .../org/apache/ignite/tools/classgen/ClassesGenerator.java    | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3fe7dfba/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 a1992b4..d50a5be 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,6 +40,7 @@ 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;
@@ -314,6 +315,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         if (log.isDebugEnabled())
             log.debug(startInfo());
 
+        U.debug(log, "COMPLETE_IN_USER_THREAD: " + COMPLETE_IN_USER_THREAD);
+
         addMessageListener(GridTopic.TOPIC_IO_TEST, new GridMessageListener() {
             @Override public void onMessage(UUID nodeId, Object msg) {
                 ClusterNode node = ctx.discovery().node(nodeId);
@@ -761,6 +764,8 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
         }
     }
 
+    private static final boolean COMPLETE_IN_USER_THREAD = IgniteSystemProperties.getBoolean("COMPLETE_IN_USER_THREAD",
false);
+
     /**
      * @param nodeId Node ID.
      * @param msg Message.
@@ -804,7 +809,7 @@ public class GridIoManager extends GridManagerAdapter<CommunicationSpi<Serializa
             return;
         }
 
-        if (msg.message() instanceof GridNearAtomicUpdateResponse) {
+        if (COMPLETE_IN_USER_THREAD && msg.message() instanceof GridNearAtomicUpdateResponse)
{
             GridNearAtomicUpdateResponse res = (GridNearAtomicUpdateResponse)msg.message();
 
             GridNearAtomicAbstractUpdateFuture f =

http://git-wip-us.apache.org/repos/asf/ignite/blob/3fe7dfba/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
index 369e318..4f4890e 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/classgen/ClassesGenerator.java
@@ -126,7 +126,7 @@ public class ClassesGenerator {
 
             System.out.println(msg);
 
-            throw new Exception(msg);
+            // throw new Exception(msg); TODO
         }
 
         PrintStream out = new PrintStream(new File(basePath,


Mime
View raw message