Changed disconnection messages to be logged at debug level because there's been various reports that agents are dropping connections. This should help in figuring it out.

Alex Huang · Alex Huang · commit 2a9dc74645e1 · 2011-06-13T11:39:39.000-07:00
diff --git a/utils/src/com/cloud/utils/nio/NioConnection.java b/utils/src/com/cloud/utils/nio/NioConnection.java
@@ -105,6 +105,7 @@ public boolean isStartup() {
     	return _isStartup;
     }
     
+    @Override
     public void run() {
     	synchronized(_thread) {
     		try {
@@ -238,7 +239,7 @@ protected void read(SelectionKey key) throws IOException {
             Task task = _factory.create(Task.Type.DATA, link, data);
             _executor.execute(task);
         } catch (Exception e) {
-            logTrace(e, key, 1);
+            logDebug(e, key, 1);
             terminate(key);
         }
     }
@@ -257,6 +258,20 @@ protected void logTrace(Exception e, SelectionKey key, int loc) {
         }
     }
 
+    protected void logDebug(Exception e, SelectionKey key, int loc) {
+        if (s_logger.isDebugEnabled()) {
+            Socket socket = null;
+            if (key != null) {
+                SocketChannel ch = (SocketChannel)key.channel();
+                if (ch != null) {
+                    socket = ch.socket();
+                }
+            }
+            
+            s_logger.debug("Location " + loc + ": Socket " + socket + " closed on read.  Probably -1 returned: " + e.getMessage());
+        }
+    }
+    
     protected void processTodos() {
         List<ChangeRequest> todos;
         if (_todos.size() == 0) {
@@ -338,8 +353,8 @@ protected void connect(SelectionKey key) throws IOException {
             if (!socket.getKeepAlive()) {
             	socket.setKeepAlive(true);
             }
-            if (s_logger.isTraceEnabled()) {
-                s_logger.trace("Connected to " + socket);
+            if (s_logger.isDebugEnabled()) {
+                s_logger.debug("Connected to " + socket);
             }
             Link link = new Link((InetSocketAddress)socket.getRemoteSocketAddress(), this);
             link.setKey(key);
@@ -370,7 +385,7 @@ protected void write(SelectionKey key) throws IOException {
                 key.interestOps(SelectionKey.OP_READ);
             }
         } catch (Exception e) {
-            logTrace(e, key, 3);
+            logDebug(e, key, 3);
             terminate(key);
         }
     }
@@ -381,8 +396,8 @@ protected void closeConnection(SelectionKey key) {
             key.cancel();
             try {
                 if (channel != null) {
-                    if (s_logger.isTraceEnabled()) {
-                        s_logger.trace("Closing socket " + channel.socket());
+                    if (s_logger.isDebugEnabled()) {
+                        s_logger.debug("Closing socket " + channel.socket());
                     }
                     channel.close();
                 }

Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,7 @@ public boolean isStartup() {`
`105`	`105`	`return _isStartup;`
`106`	`106`	`}`
`107`	`107`
	`108`	`+ @Override`
`108`	`109`	`public void run() {`
`109`	`110`	`synchronized(_thread) {`
`110`	`111`	`try {`
`@@ -238,7 +239,7 @@ protected void read(SelectionKey key) throws IOException {`
`238`	`239`	`Task task = _factory.create(Task.Type.DATA, link, data);`
`239`	`240`	`_executor.execute(task);`
`240`	`241`	`} catch (Exception e) {`
`241`		`- logTrace(e, key, 1);`
	`242`	`+ logDebug(e, key, 1);`
`242`	`243`	`terminate(key);`
`243`	`244`	`}`
`244`	`245`	`}`
`@@ -257,6 +258,20 @@ protected void logTrace(Exception e, SelectionKey key, int loc) {`
`257`	`258`	`}`
`258`	`259`	`}`
`259`	`260`
	`261`	`+ protected void logDebug(Exception e, SelectionKey key, int loc) {`
	`262`	`+ if (s_logger.isDebugEnabled()) {`
	`263`	`+ Socket socket = null;`
	`264`	`+ if (key != null) {`
	`265`	`+ SocketChannel ch = (SocketChannel)key.channel();`
	`266`	`+ if (ch != null) {`
	`267`	`+ socket = ch.socket();`
	`268`	`+ }`
	`269`	`+ }`
	`270`	`+`
	`271`	`+ s_logger.debug("Location " + loc + ": Socket " + socket + " closed on read. Probably -1 returned: " + e.getMessage());`
	`272`	`+ }`
	`273`	`+ }`
	`274`	`+`
`260`	`275`	`protected void processTodos() {`
`261`	`276`	`List<ChangeRequest> todos;`
`262`	`277`	`if (_todos.size() == 0) {`
`@@ -338,8 +353,8 @@ protected void connect(SelectionKey key) throws IOException {`
`338`	`353`	`if (!socket.getKeepAlive()) {`
`339`	`354`	`socket.setKeepAlive(true);`
`340`	`355`	`}`
`341`		`- if (s_logger.isTraceEnabled()) {`
`342`		`- s_logger.trace("Connected to " + socket);`
	`356`	`+ if (s_logger.isDebugEnabled()) {`
	`357`	`+ s_logger.debug("Connected to " + socket);`
`343`	`358`	`}`
`344`	`359`	`Link link = new Link((InetSocketAddress)socket.getRemoteSocketAddress(), this);`
`345`	`360`	`link.setKey(key);`
`@@ -370,7 +385,7 @@ protected void write(SelectionKey key) throws IOException {`
`370`	`385`	`key.interestOps(SelectionKey.OP_READ);`
`371`	`386`	`}`
`372`	`387`	`} catch (Exception e) {`
`373`		`- logTrace(e, key, 3);`
	`388`	`+ logDebug(e, key, 3);`
`374`	`389`	`terminate(key);`
`375`	`390`	`}`
`376`	`391`	`}`
`@@ -381,8 +396,8 @@ protected void closeConnection(SelectionKey key) {`
`381`	`396`	`key.cancel();`
`382`	`397`	`try {`
`383`	`398`	`if (channel != null) {`
`384`		`- if (s_logger.isTraceEnabled()) {`
`385`		`- s_logger.trace("Closing socket " + channel.socket());`
	`399`	`+ if (s_logger.isDebugEnabled()) {`
	`400`	`+ s_logger.debug("Closing socket " + channel.socket());`
`386`	`401`	`}`
`387`	`402`	`channel.close();`
`388`	`403`	`}`