cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [1/4] git commit: updated refs/heads/master to 821b2da
Date Fri, 13 May 2016 15:10:20 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 2b4b8aa40 -> 821b2da12


CLOUDSTACK-9348: Make NioConnectio loop less aggressive

- Reverts ea2286 that introduced a wakeup on each connection loop run.
- In SSL handshake code removes delegated tasks to be run in separate threads.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/540d9572
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/540d9572
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/540d9572

Branch: refs/heads/master
Commit: 540d9572fd491db3ce182d26636fc74ada4e171c
Parents: 2b4b8aa
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri May 13 08:54:24 2016 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri May 13 08:54:49 2016 +0530

----------------------------------------------------------------------
 utils/src/main/java/com/cloud/utils/nio/Link.java          | 5 ++++-
 utils/src/main/java/com/cloud/utils/nio/NioConnection.java | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/540d9572/utils/src/main/java/com/cloud/utils/nio/Link.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/nio/Link.java b/utils/src/main/java/com/cloud/utils/nio/Link.java
index da2c0d5..02ffaab 100644
--- a/utils/src/main/java/com/cloud/utils/nio/Link.java
+++ b/utils/src/main/java/com/cloud/utils/nio/Link.java
@@ -615,7 +615,10 @@ public class Link {
                 case NEED_TASK:
                     Runnable task;
                     while ((task = sslEngine.getDelegatedTask()) != null) {
-                        new Thread(task).run();
+                        if (s_logger.isTraceEnabled()) {
+                            s_logger.trace("SSL: Running delegated task!");
+                        }
+                        task.run();
                     }
                     break;
                 case FINISHED:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/540d9572/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
----------------------------------------------------------------------
diff --git a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
index 749e552..6fdb473 100644
--- a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
+++ b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
@@ -171,8 +171,6 @@ public abstract class NioConnection implements Callable<Boolean>
{
             } catch (final IOException e) {
                 s_logger.error("Agent will die due to this IOException!", e);
                 throw new NioConnectionException(e.getMessage(), e);
-            } finally {
-                _selector.wakeup();
             }
         }
         _isStartup = false;


Mime
View raw message