You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/01/24 16:54:28 UTC
[maven-mvnd] 01/05: Make connection timeouts configurable, fixes #772 (#778)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvnd-0.9.x
in repository https://gitbox.apache.org/repos/asf/maven-mvnd.git
commit b8028d2e10df28cfe655f33aef0bfbb8414cbf0d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 23 19:56:49 2023 +0100
Make connection timeouts configurable, fixes #772 (#778)
---
.../org/mvndaemon/mvnd/client/DaemonConnector.java | 35 +++++++++++++++-------
.../org/mvndaemon/mvnd/common/Environment.java | 12 ++++++++
2 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index cd5f416d..b9dfb7e1 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -69,10 +69,6 @@ import static org.mvndaemon.mvnd.common.DaemonState.Canceled;
*/
public class DaemonConnector {
- public static final int DEFAULT_CONNECT_TIMEOUT = 30000;
- public static final int CANCELED_WAIT_TIMEOUT = 3000;
- private static final int CONNECT_TIMEOUT = 10000;
-
private static final Logger LOGGER = LoggerFactory.getLogger(DaemonConnector.class);
private final DaemonRegistry registry;
@@ -164,6 +160,11 @@ public class DaemonConnector {
});
serverThread.start();
long start = System.currentTimeMillis();
+ long stop = start
+ + parameters
+ .property(Environment.MVND_CONNECT_TIMEOUT)
+ .asDuration()
+ .toMillis();
do {
DaemonClientConnection daemonConnection = connectToDaemonWithId(daemon, true);
if (daemonConnection != null) {
@@ -174,7 +175,7 @@ public class DaemonConnector {
} catch (InterruptedException e) {
throw new DaemonException.InterruptedException(e);
}
- } while (serverThread.isAlive() && System.currentTimeMillis() - start < DEFAULT_CONNECT_TIMEOUT);
+ } while (serverThread.isAlive() && System.currentTimeMillis() < stop);
throw new RuntimeException("Unable to connect to internal daemon", throwable.get());
}
@@ -261,7 +262,12 @@ public class DaemonConnector {
if (!compatibleCanceledDaemons.isEmpty()) {
LOGGER.debug("Waiting for daemons with canceled builds to become available");
long start = System.currentTimeMillis();
- while (connection == null && System.currentTimeMillis() - start < CANCELED_WAIT_TIMEOUT) {
+ long stop = start
+ + parameters
+ .property(Environment.MVND_CANCEL_CONNECT_TIMEOUT)
+ .asDuration()
+ .toMillis();
+ while (connection == null && System.currentTimeMillis() < stop) {
try {
sleep(200);
connection = connectToIdleDaemon(registry.getIdle(), constraint);
@@ -304,6 +310,11 @@ public class DaemonConnector {
final Process process = startDaemonProcess(daemonId, output);
LOGGER.debug("Started Maven daemon {}", daemonId);
long start = System.currentTimeMillis();
+ long stop = start
+ + parameters
+ .property(Environment.MVND_CONNECT_TIMEOUT)
+ .asDuration()
+ .toMillis();
do {
DaemonClientConnection daemonConnection = connectToDaemonWithId(daemonId, true);
if (daemonConnection != null) {
@@ -314,7 +325,7 @@ public class DaemonConnector {
} catch (InterruptedException e) {
throw new DaemonException.InterruptedException(e);
}
- } while (process.isAlive() && System.currentTimeMillis() - start < DEFAULT_CONNECT_TIMEOUT);
+ } while (process.isAlive() && System.currentTimeMillis() < stop);
DaemonDiagnostics diag = new DaemonDiagnostics(daemonId, parameters);
throw new DaemonException.ConnectException(
"Timeout waiting to connect to the Maven daemon.\n" + diag.describe());
@@ -546,13 +557,17 @@ public class DaemonConnector {
socketChannel.configureBlocking(false);
boolean connected = socketChannel.connect(address);
if (!connected) {
- long t0 = System.nanoTime();
- long t1 = t0 + TimeUnit.MICROSECONDS.toNanos(CONNECT_TIMEOUT);
+ long t0 = System.currentTimeMillis();
+ long t1 = t0
+ + parameters
+ .property(Environment.MVND_SOCKET_CONNECT_TIMEOUT)
+ .asDuration()
+ .toMillis();
while (!connected && t0 < t1) {
Thread.sleep(10);
connected = socketChannel.finishConnect();
if (!connected) {
- t0 = System.nanoTime();
+ t0 = System.currentTimeMillis();
}
}
if (!connected) {
diff --git a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
index 5ac6185a..65dcddcc 100644
--- a/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
+++ b/common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
@@ -290,6 +290,18 @@ public enum Environment {
* Whether or not decorate output and error streams
**/
MVND_RAW_STREAMS("mvnd.rawStreams", null, Boolean.FALSE, OptionType.VOID, Flags.OPTIONAL, "mvnd:--raw-streams"),
+ /**
+ * Overall timeout to connect to a daemon.
+ */
+ MVND_CONNECT_TIMEOUT("mvnd.connectTimeout", null, "10 seconds", OptionType.DURATION, Flags.NONE),
+ /**
+ * Timeout to establish the socket connection.
+ */
+ MVND_SOCKET_CONNECT_TIMEOUT("mvnd.socketConnectTimeout", null, "1 seconds", OptionType.DURATION, Flags.NONE),
+ /**
+ * Timeout to connect to a cancelled daemon.
+ */
+ MVND_CANCEL_CONNECT_TIMEOUT("mvnd.cancelConnectTimeout", null, "3 seconds", OptionType.DURATION, Flags.NONE),
;
static Properties properties;