Bug CS-17825: Don't rely on XS to cleanup idle session but proactively close it from console proxy

kelveny · kelveny · commit f38c4e9ea684 · 2013-06-10T17:46:42.000-07:00
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
@@ -253,7 +253,8 @@ public String onAjaxClientStart(String title, List<String> languages, String gue
         
         if(s_logger.isTraceEnabled())
             s_logger.trace("Ajax client start, frame buffer w: " + width + ", " + height);
-        
+
+/*        
         int retry = 0;
         tracker.initCoverageTest();
         while(!tracker.hasFullCoverage() && retry < 10) {
@@ -263,6 +264,7 @@ public String onAjaxClientStart(String title, List<String> languages, String gue
             }
             retry++;
         }
+*/
         
         List<TileInfo> tiles = tracker.scan(true);
         String imgUrl = prepareAjaxImage(tiles, true);
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
@@ -64,6 +64,7 @@ private void cleanupLogging() {
     public void run() {
         
         boolean bReportLoad = false;
+        long lastReportTick = System.currentTimeMillis();
         while (true) {
             cleanupLogging();
             bReportLoad = false;
@@ -95,10 +96,12 @@ public void run() {
                 client.closeClient();
             }
             
-            if(bReportLoad) {
+            if(bReportLoad || System.currentTimeMillis() - lastReportTick > 5000) {
                 // report load changes
                 String loadInfo = new ConsoleProxyClientStatsCollector(connMap).getStatsReport(); 
                 ConsoleProxy.reportLoadInfo(loadInfo);
+                lastReportTick = System.currentTimeMillis();
+                
                 if(s_logger.isDebugEnabled())
                     s_logger.debug("Report load change : " + loadInfo);
             }
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyVncClient.java
@@ -46,7 +46,7 @@ public class ConsoleProxyVncClient extends ConsoleProxyClientBase {
     
     private VncClient client;
     private Thread worker;
-    private boolean workerDone = false;
+    private volatile boolean workerDone = false;
     
     private int lastModifierStates = 0;
     private int lastPointerMask = 0;
@@ -80,7 +80,7 @@ public void run() {
                 String tunnelUrl = getClientParam().getClientTunnelUrl();
                 String tunnelSession = getClientParam().getClientTunnelSession();
                 
-                for(int i = 0; i < 15; i++) {
+                for(int i = 0; i < 15 && !workerDone; i++) {
                     try {
                         if(tunnelUrl != null && !tunnelUrl.isEmpty() && tunnelSession != null && !tunnelSession.isEmpty()) {
                             URI uri = new URI(tunnelUrl);
@@ -136,6 +136,7 @@ public void run() {
     
     @Override
     public void closeClient() {
+    	workerDone = true;
         if(client != null)
             client.shutdown();
     }
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncClientPacketSender.java
@@ -77,8 +77,10 @@ public void run() {
             s_logger.error("Unexpected exception: ", e);
             if (connectionAlive) {
                 closeConnection();
-                vncConnection.shutdown();
             }
+        } finally {
+        	s_logger.info("Sending thread exit processing, shutdown connection");
+            vncConnection.shutdown();
         }
     }
 
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java b/services/console-proxy/server/src/com/cloud/consoleproxy/vnc/VncServerPacketReceiver.java
@@ -90,8 +90,10 @@ public void run() {
             s_logger.error("Unexpected exception: ", e);
             if (connectionAlive) {
                 closeConnection();
-                vncConnection.shutdown();
             }
+        } finally {
+        	s_logger.info("Receiving thread exit processing, shutdown connection");
+            vncConnection.shutdown();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -77,8 +77,10 @@ public void run() {`
`77`	`77`	`s_logger.error("Unexpected exception: ", e);`
`78`	`78`	`if (connectionAlive) {`
`79`	`79`	`closeConnection();`
`80`		`- vncConnection.shutdown();`
`81`	`80`	`}`
	`81`	`+ } finally {`
	`82`	`+ s_logger.info("Sending thread exit processing, shutdown connection");`
	`83`	`+ vncConnection.shutdown();`
`82`	`84`	`}`
`83`	`85`	`}`
`84`	`86`
Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,10 @@ public void run() {`
`90`	`90`	`s_logger.error("Unexpected exception: ", e);`
`91`	`91`	`if (connectionAlive) {`
`92`	`92`	`closeConnection();`
`93`		`- vncConnection.shutdown();`
`94`	`93`	`}`
	`94`	`+ } finally {`
	`95`	`+ s_logger.info("Receiving thread exit processing, shutdown connection");`
	`96`	`+ vncConnection.shutdown();`
`95`	`97`	`}`
`96`	`98`	`}`
`97`	`99`