diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java index 54bffd2a14b3d..9d2e6a7a2a024 100644 --- a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java +++ b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java @@ -42,7 +42,7 @@ public abstract class RunTask extends DefaultTestClustersTask { private Boolean debug = false; private Boolean cliDebug = false; - private Boolean entitlementsEnabled = false; + private Boolean apmServerEnabled = false; private Boolean preserveData = false; @@ -74,9 +74,7 @@ public void setCliDebug(boolean enabled) { option = "entitlements", description = "Use the Entitlements agent system in place of SecurityManager to enforce sandbox policies." ) - public void setEntitlementsEnabled(boolean enabled) { - this.entitlementsEnabled = enabled; - } + public void setEntitlementsEnabled(boolean enabled) {} @Input public Boolean getDebug() { @@ -90,7 +88,7 @@ public Boolean getCliDebug() { @Input public Boolean getEntitlementsEnabled() { - return entitlementsEnabled; + return true; } @Input @@ -240,9 +238,7 @@ else if (node.getSettingKeys().contains("telemetry.metrics.enabled") == false) { if (cliDebug) { enableCliDebug(); } - if (entitlementsEnabled) { - enableEntitlements(); - } + enableEntitlements(); } @TaskAction diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java index c830280058d45..3bab8d528ffef 100644 --- a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java +++ b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java @@ -11,8 +11,6 @@ import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.concurrent.EsExecutors; -import org.elasticsearch.core.Booleans; -import org.elasticsearch.core.UpdateForV9; import org.elasticsearch.jdk.RuntimeVersionFeature; import java.io.IOException; @@ -27,10 +25,10 @@ final class SystemJvmOptions { static List systemJvmOptions(Settings nodeSettings, final Map sysprops) { String distroType = sysprops.get("es.distribution.type"); + String javaType = sysprops.get("es.java.type"); boolean isHotspot = sysprops.getOrDefault("sun.management.compiler", "").contains("HotSpot"); - boolean entitlementsExplicitlyEnabled = Booleans.parseBoolean(sysprops.getOrDefault("es.entitlements.enabled", "true")); - // java 24+ only supports entitlements, but it may be enabled on earlier versions explicitly - boolean useEntitlements = RuntimeVersionFeature.isSecurityManagerAvailable() == false || entitlementsExplicitlyEnabled; + + boolean useEntitlements = true; return Stream.of( Stream.of( /* @@ -69,8 +67,9 @@ static List systemJvmOptions(Settings nodeSettings, final Map) () -> {