Skip to content

cpvm: Fix CPVM not releasing CPU after closing console #7826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 7 commits into from
Aug 18, 2023
Merged

cpvm: Fix CPVM not releasing CPU after closing console #7826

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
128852e
Fix websocket
JoaoJandre Aug 7, 2023
f80deb7
add some logs
JoaoJandre Aug 10, 2023
813d094
Merge remote-tracking branch 'origin/4.18' into fix-console-proxy-not…
JoaoJandre Aug 14, 2023
595bdfb
fix pokemon catch
JoaoJandre Aug 14, 2023
a0bb491
address Wei's review
JoaoJandre Aug 15, 2023
8b5cd4d
remove unnecessary import
JoaoJandre Aug 16, 2023
b7820b3
address wei's reviews
JoaoJandre Aug 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...es/console-proxy/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyNoVncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,30 +113,34 @@ public void run() {
if (client.isVncOverWebSocketConnectionOpen()) {
updateFrontEndActivityTime();
}
connectionAlive = client.isVncOverWebSocketConnectionAlive();
connectionAlive = session.isOpen();
Comment thread
weizhouapache marked this conversation as resolved.
try {
Thread.sleep(1);
} catch (Exception e) {
s_logger.warn("Error on sleep for vnc over websocket", e);
} catch (InterruptedException e) {
s_logger.error("Error on sleep for vnc over websocket", e);
}
} 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));
Comment thread
weizhouapache marked this conversation as resolved.
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));
Comment thread
JoaoJandre marked this conversation as resolved.
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);
}
Expand Down