Skip to content

test(qwp): close TestWebSocketServer connections gracefully so scripted drops deliver their acks #95

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

Open
jovfer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

test(qwp): close TestWebSocketServer connections gracefully so scripted drops deliver their acks #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 27 additions & 1 deletion core/src/test/java/io/questdb/client/test/cutlass/qwp/websocket/TestWebSocketServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,7 @@ public void start() throws IOException {
while (running.get()) {
try {
Socket clientSocket = serverSocket.accept();
clientSocket.setTcpNoDelay(true);
ClientHandler clientHandler = new ClientHandler(clientSocket);
clients.add(clientHandler);
clientHandler.start();
Expand Down Expand Up @@ -445,12 +446,22 @@ public class ClientHandler implements Closeable {
@Override
public void close() {
running.set(false);
try {
// FIN after the frames already written, never an RST: closing with unread input
// resets the connection and purges anything still queued for the peer.
socket.shutdownOutput();
if (readThread == Thread.currentThread()) {
drainInput();
}
} catch (IOException e) {
// ignore
}
try {
socket.close();
} catch (IOException e) {
// ignore
}
if (readThread != null) {
if (readThread != null && readThread != Thread.currentThread()) {
try {
readThread.join(5000);
} catch (InterruptedException e) {
Expand All @@ -459,6 +470,21 @@ public void close() {
}
}

private void drainInput() throws IOException {
socket.setSoTimeout(20);
byte[] scratch = new byte[8192];
long deadlineNanos = System.nanoTime() + 200_000_000L;
while (System.nanoTime() < deadlineNanos) {
try {
if (in.read(scratch) < 0) {
return;
}
} catch (SocketTimeoutException e) {
return;
}
}
}

public synchronized void sendBinary(byte[] data) throws IOException {
writeFrame(WebSocketOpcode.BINARY, data, data.length);
}
Expand Down
Loading