Skip to content
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

Jump to bottom

[JENKINS-70531] Apply timeout on WebSocket write operations (and simplify AbstractByteBufferCommandTransport) #621

Merged
merged 7 commits into from Feb 3, 2023
Merged

[JENKINS-70531] Apply timeout on WebSocket write operations (and simplify AbstractByteBufferCommandTransport) #621

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d296a8
Apply timeout on WebSocket write operations
jglick Jan 20, 2023
f2ead41
Simplifying `AbstractByteBufferCommandTransport` to write a single `B…
jglick Jan 20, 2023
6f43114
Javadoc fix
jglick Jan 21, 2023
3f1679b
Merge branch 'master' into write-timeout
jglick Feb 1, 2023
3c6bdcd
For clarity, set buffer limit before `ChunkHeader.write` even though …
jglick Feb 2, 2023
d90baa5
Introduce `ChunkHeader.SIZE` constant for clarity
jglick Feb 2, 2023
4e88ad5
Forgotten spot where `ChunkHeader.SIZE` would be appropriate
jglick Feb 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/main/java/hudson/remoting/Engine.java
View file
Open in desktop
Expand Up @@ -648,9 +648,18 @@ class Transport extends AbstractByteBufferCommandTransport {
}
@Override
protected void write(ByteBuffer header, ByteBuffer data) throws IOException {
LOGGER.finest(() -> "sending message of length + " + ChunkHeader.length(ChunkHeader.peek(header)));
session.getBasicRemote().sendBinary(header, false);
session.getBasicRemote().sendBinary(data, true);
LOGGER.finest(() -> "sending message of length " + ChunkHeader.length(ChunkHeader.peek(header)));
// RemoteEndpoint.Async seems to lack isLast overloads
// adapted from https://stackoverflow.com/a/42170003/12916
ByteBuffer headerAndData = ByteBuffer.allocate(header.remaining() + data.remaining());
jglick marked this conversation as resolved.
Show resolved Hide resolved
headerAndData.put(header.duplicate());
headerAndData.put(data.duplicate());
headerAndData.rewind();
try {
session.getAsyncRemote().sendBinary(headerAndData).get(5, TimeUnit.MINUTES);
} catch (Exception x) {
throw new IOException(x);
}
}

@Override
Expand Down