You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by "JoaoJandre (via GitHub)" <gi...@apache.org> on 2023/08/15 17:15:49 UTC
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #7826: cpvm: Fix CPVM not releasing CPU after closing console
JoaoJandre commented on code in PR #7826:
URL: https://github.com/apache/cloudstack/pull/7826#discussion_r1294889711
##########
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java:
##########
@@ -113,32 +114,36 @@ public void run() {
if (client.isVncOverWebSocketConnectionOpen()) {
updateFrontEndActivityTime();
}
- connectionAlive = client.isVncOverWebSocketConnectionAlive();
- try {
- Thread.sleep(1);
- } catch (Exception e) {
- s_logger.warn("Error on sleep for vnc over websocket", e);
- }
+ connectionAlive = session.isOpen();
+ Thread.sleep(1);
} else if (client.isVncOverNioSocket()) {
byte[] bytesArr;
int nextBytes = client.getNextBytes();
bytesArr = new byte[nextBytes];
client.readBytes(bytesArr, nextBytes);
+ s_logger.trace(String.format("Read [%s] bytes from client [%s]", nextBytes, clientId));
if (nextBytes > 0) {
session.getRemote().sendBytes(ByteBuffer.wrap(bytesArr));
updateFrontEndActivityTime();
+ } else {
+ connectionAlive = session.isOpen();
}
} else {
b = new byte[100];
readBytes = client.read(b);
+ s_logger.trace(String.format("Read [%s] bytes from client [%s]", readBytes, clientId));
if (readBytes == -1 || (readBytes > 0 && !sendReadBytesToNoVNC(b, readBytes))) {
connectionAlive = false;
}
}
}
- connectionAlive = false;
+ s_logger.info(String.format("Connection with client [%s] is dead.", clientId));
} catch (IOException e) {
s_logger.error("Error on VNC client", e);
+ } catch (InterruptedException e) {
Review Comment:
@weizhouapache catching all exceptions is a bad practice, there's no reason to use that in this situation. But I can remove the exception being thrown and just keep the log.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org