Skip to content

Commit ed8d47e

Browse files
committed
Revert "CLOUDSTACK-9348: Make NioConnectio loop less aggressive"
This reverts commit 540d957. This was reverted because it seemed to be related to an issue when doing a DeployDC, causing an `addHost` error.
1 parent e3b38bb commit ed8d47e

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

utils/src/main/java/com/cloud/utils/nio/Link.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -615,10 +615,7 @@ public static boolean doHandshake(final SocketChannel socketChannel, final SSLEn
615615
case NEED_TASK:
616616
Runnable task;
617617
while ((task = sslEngine.getDelegatedTask()) != null) {
618-
if (s_logger.isTraceEnabled()) {
619-
s_logger.trace("SSL: Running delegated task!");
620-
}
621-
task.run();
618+
new Thread(task).run();
622619
}
623620
break;
624621
case FINISHED:

utils/src/main/java/com/cloud/utils/nio/NioConnection.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ public Boolean call() throws NioConnectionException {
171171
} catch (final IOException e) {
172172
s_logger.error("Agent will die due to this IOException!", e);
173173
throw new NioConnectionException(e.getMessage(), e);
174+
} finally {
175+
_selector.wakeup();
174176
}
175177
}
176178
_isStartup = false;

0 commit comments

Comments
 (0)