Run client connection handler inside new thread, fixes #798 (#799)
* Run client connection handler inside new thread, fixes #798
* Execute CI build on ubuntu-22.04
diff --git a/.github/workflows/early-access.yaml b/.github/workflows/early-access.yaml
index 6ea6292..2b4fcc7 100644
--- a/.github/workflows/early-access.yaml
+++ b/.github/workflows/early-access.yaml
@@ -34,7 +34,7 @@
strategy:
fail-fast: false
matrix:
- os: [ ubuntu-18.04, macOS-10.15, windows-2019 ]
+ os: [ ubuntu-22.04, macOS-10.15, windows-2019 ]
runs-on: ${{ matrix.os }}
steps:
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
index 115417c..be66cbb 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/daemon/Server.java
@@ -233,7 +233,16 @@
try {
while (true) {
try (SocketChannel socket = this.socket.accept()) {
- client(socket);
+ try {
+ // execute the client connection handling inside a new thread to guard against possible
+ // ThreadLocal memory leaks
+ // see https://github.com/apache/maven-mvnd/issues/798 for more details
+ Thread handler = new Thread(() -> client(socket));
+ handler.start();
+ handler.join();
+ } catch (Throwable t) {
+ LOGGER.error("Error handling a client connection", t);
+ }
}
}
} catch (Throwable t) {
@@ -264,7 +273,7 @@
updateState(DaemonState.Idle);
return;
}
- LOGGER.info("Request received: " + message);
+ LOGGER.info("Request received: {}", message);
if (message instanceof BuildRequest) {
handle(connection, (BuildRequest) message);
}
