Skip to content

[7.17] Make --debug-server-jvm work with new test framework (#93355) #93361

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

Merged
mark-vieira merged 1 commit into from
Jan 31, 2023
Merged

[7.17] Make --debug-server-jvm work with new test framework (#93355) #93361

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions ...ools/src/main/java/org/elasticsearch/gradle/testclusters/StandaloneRestIntegTestTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public StandaloneRestIntegTestTask() {
@Option(option = "debug-server-jvm", description = "Enable debugging configuration, to allow attaching a debugger to elasticsearch.")
public void setDebugServer(boolean enabled) {
this.debugServer = enabled;
systemProperty("tests.cluster.debug.enabled", Boolean.toString(enabled));
}

@Nested
Expand Down
12 changes: 11 additions & 1 deletion ...test-clusters/src/main/java/org/elasticsearch/test/cluster/local/LocalClusterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public class LocalClusterFactory implements ClusterFactory<LocalClusterSpec, Loc
private static final String TESTS_CLUSTER_PLUGINS_PATH_SYSPROP = "tests.cluster.plugins.path";
private static final String TESTS_CLUSTER_FIPS_JAR_PATH_SYSPROP = "tests.cluster.fips.jars.path";
public static final Pattern BUNDLE_ARTIFACT_PATTERN = Pattern.compile("(.+)(?:-\\d\\.\\d\\.\\d-SNAPSHOT\\.zip)?");
private static final String TESTS_CLUSTER_DEBUG_ENABLED_SYSPROP = "tests.cluster.debug.enabled";
private static final String ENABLE_DEBUG_JVM_ARGS = "-agentlib:jdwp=transport=dt_socket,server=n,suspend=y,address=";
private static final int DEFAULT_DEBUG_PORT = 5007;

private final Path baseWorkingDir;
private final DistributionResolver distributionResolver;
Expand Down Expand Up @@ -549,13 +552,20 @@ private Map<String, String> getEnvironmentVariables() {
.collect(Collectors.joining(" "));
}

String debugArgs = "";
if (Boolean.getBoolean(TESTS_CLUSTER_DEBUG_ENABLED_SYSPROP)) {
int port = DEFAULT_DEBUG_PORT + spec.getCluster().getNodes().indexOf(spec);
debugArgs = ENABLE_DEBUG_JVM_ARGS + port;
}

String heapSize = System.getProperty("tests.heap.size", "512m");
environment.put("ES_JAVA_OPTS", "-Xms" + heapSize + " -Xmx" + heapSize + " -ea -esa "
// Support passing in additional JVM arguments
+ System.getProperty("tests.jvm.argline", "")
+ " "
+ featureFlagProperties
+ systemProperties);
+ systemProperties
+ debugArgs);

return environment;
}
Expand Down