apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-27 16:08:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Make connection timeouts configurable, fixes #772 (#778)

Browse Source
This commit is contained in:
Guillaume Nodet
2023-01-23 19:56:49 +01:00
committed by GitHub
parent a2a5854887
commit 19cc6c42b7
2 changed files with 37 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
View File

@@ -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) {

12
common/src/main/java/org/mvndaemon/mvnd/common/Environment.java
View File

@@ -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;