apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-10-14 14:10:52 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

mvnd IT: increase connectTimeout for ITs (#1171)

Browse Source 
Experiment PR to figure out why MacOS GH runners keep failing with transport related (SSL handshake abort, HTTP timeouts) errors. As we know linux and windows boxes are in Azure, while macos boxes are somewhere else, and we get regularly real strange errors like "SSL handshake errors", "HTTP timeout error (against Central?)", so suspicion is on JDK transport (in HTTP/2 mode).

Experiments:
* force apache transport (HTTP/1.1) - ✔️ 
* force JDK transport into HTTP/1.1 - 🟥 
* use big timeout for connectTimeout - ✔️ 

Conclusion: for ITs we will for now increase the default (10sec) `connectTimeout` Resolver configuration, as it seems too low.
This commit is contained in:
Tamas Cservenak
2024-10-17 14:07:05 +02:00
committed by GitHub
parent 9734734140
commit 11a6ed3528
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration-tests/src/test/java/org/mvndaemon/mvnd/junit/JvmTestClient.java
View File

@@ -30,6 +30,8 @@ import org.mvndaemon.mvnd.client.ExecutionResult;
import org.mvndaemon.mvnd.common.Environment;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
import static org.mvndaemon.mvnd.junit.TestUtils.augmentArgs;
public class JvmTestClient extends DefaultClient {
private final DaemonParameters parameters;
@@ -47,7 +49,7 @@ public class JvmTestClient extends DefaultClient {
if (parameters instanceof TestParameters && ((TestParameters) parameters).isNoTransferProgress()) {
argv.add("-ntp");
}
final ExecutionResult delegate = super.execute(output, argv);
final ExecutionResult delegate = super.execute(output, augmentArgs(argv));
if (output instanceof TestClientOutput) {
return new JvmTestResult(delegate, ((TestClientOutput) output).messagesToString());
}

5
integration-tests/src/test/java/org/mvndaemon/mvnd/junit/NativeTestClient.java
View File

@@ -35,6 +35,8 @@ import org.mvndaemon.mvnd.common.Message;
import org.mvndaemon.mvnd.common.OsUtils.CommandProcess;
import org.mvndaemon.mvnd.common.logging.ClientOutput;
import static org.mvndaemon.mvnd.junit.TestUtils.augmentArgs;
/**
* A wrapper around the native executable.
*/
@@ -66,7 +68,8 @@ public class NativeTestClient implements Client {
public ExecutionResult execute(ClientOutput output, List<String> args) throws InterruptedException {
final List<String> cmd = new ArrayList<>(args.size() + 6);
cmd.add(mvndNativeExecutablePath.toString());
cmd.addAll(args);
cmd.addAll(augmentArgs(args));
add(Environment.MVND_DAEMON_STORAGE, cmd, parameters::daemonStorage);
add(Environment.MAVEN_REPO_LOCAL, cmd, parameters::mavenRepoLocal);
add(Environment.MAVEN_SETTINGS, cmd, parameters::settings);

15
integration-tests/src/test/java/org/mvndaemon/mvnd/junit/TestUtils.java
View File

@@ -21,10 +21,25 @@ package org.mvndaemon.mvnd.junit;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Stream;
public class TestUtils {
/**
* IT circumvention for JDK transport low timeouts and GH macOS runners networking issues.
* If arguments does not contain settings for timeouts (ie as part of test), they will be
* added to increase timeouts for IT runs.
*/
public static List<String> augmentArgs(List<String> args) {
ArrayList<String> result = new ArrayList<>(args);
if (result.stream().noneMatch(s -> s.contains("aether.transport.http.connectTimeout"))) {
result.add("-Daether.transport.http.connectTimeout=1800000");
}
// note: def value for requestTimeout=1800000; not setting it as it is fine
return result;
}
public static void replace(Path path, String find, String replacement) {
try {