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 b4ad38d
Date Mon, 16 May 2016 21:31:53 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master e3b38bbd4 -> b4ad38d68


Revert "CLOUDSTACK-9348: Make NioConnectio loop less aggressive"

This reverts commit 540d9572fd491db3ce182d26636fc74ada4e171c.

This was reverted because it seemed to be related to an issue
when doing a DeployDC, causing an `addHost` error.


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

Branch: refs/heads/master
Commit: ed8d47eef2210847a93934d78eb32fc5cfb731fe
Parents: e3b38bb
Author: Will Stevens <williamstevens@gmail.com>
Authored: Mon May 16 17:27:07 2016 -0400
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Mon May 16 17:27:07 2016 -0400

----------------------------------------------------------------------
 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, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed8d47ee/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 6fdb473..749e552 100644
--- a/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
+++ b/utils/src/main/java/com/cloud/utils/nio/NioConnection.java
@@ -171,6 +171,8 @@ 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