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 <[email protected]>
cloudtrends · May 13, 2016 · 540d957 · 540d957
1 parent 2b4b8aa
commit 540d957
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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 static boolean doHandshake(final SocketChannel socketChannel, final SSLEn
  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:

diff --git 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 Boolean call() throws NioConnectionException {
  } 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;