Merge pull request #6238 from bstansberry/WFCORE-7049

[WFCORE-7049] Remove MaxMetaspaceSize settings
wildfly · Nov 14, 2024 · b7f831e · b7f831e
2 parents 3989deb + fc2940f
commit b7f831e
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 22 deletions.
diff --git a/core-feature-pack/common/src/main/resources/content/bin/domain.conf b/core-feature-pack/common/src/main/resources/content/bin/domain.conf
@@ -56,7 +56,7 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JBOSS_JAVA_SIZING" = "x" ]; then
-   JBOSS_JAVA_SIZING="-Xms64m -Xmx512m -XX:MaxMetaspaceSize=256m"
+   JBOSS_JAVA_SIZING="-Xms64m -Xmx512m"
 fi
 if [ "x$JAVA_OPTS" = "x" ]; then
    JAVA_OPTS="$JBOSS_JAVA_SIZING -Djava.net.preferIPv4Stack=true"

diff --git a/core-feature-pack/common/src/main/resources/content/bin/domain.conf.bat b/core-feature-pack/common/src/main/resources/content/bin/domain.conf.bat
@@ -44,7 +44,7 @@ if not "x%JAVA_OPTS%" == "x" (
 
 if "x%JBOSS_JAVA_SIZING%" == "x" (
     rem # JVM memory allocation pool parameters - modify as appropriate.
-    set "JBOSS_JAVA_SIZING=-Xms64M -Xmx512M -XX:MaxMetaspaceSize=256m"
+    set "JBOSS_JAVA_SIZING=-Xms64M -Xmx512M"
 )
 set "JAVA_OPTS=%JBOSS_JAVA_SIZING%"
 

diff --git a/core-feature-pack/common/src/main/resources/content/bin/domain.conf.ps1 b/core-feature-pack/common/src/main/resources/content/bin/domain.conf.ps1
@@ -33,7 +33,7 @@ if (-Not $JAVA_OPTS) {
     $JAVA_OPTS = @()
 
     if (-Not(test-path env:JBOSS_JAVA_SIZING)) {
-        $env:JBOSS_JAVA_SIZING = "-Xms64M -Xmx512M -XX:MaxMetaspaceSize=256m"
+        $env:JBOSS_JAVA_SIZING = "-Xms64M -Xmx512M"
     }
     $JAVA_OPTS += String-To-Array($env:JBOSS_JAVA_SIZING)
 

diff --git a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf
@@ -60,7 +60,7 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JBOSS_JAVA_SIZING" = "x" ]; then
-   JBOSS_JAVA_SIZING="-Xms64m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m"
+   JBOSS_JAVA_SIZING="-Xms64m -Xmx512m -XX:MetaspaceSize=96M"
 fi
 if [ "x$JAVA_OPTS" = "x" ]; then
    JAVA_OPTS="$JBOSS_JAVA_SIZING -Djava.net.preferIPv4Stack=true"

diff --git a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.bat b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.bat
@@ -47,7 +47,7 @@ rem #
 
 if "x%JBOSS_JAVA_SIZING%" == "x" (
     rem # JVM memory allocation pool parameters - modify as appropriate.
-    set "JBOSS_JAVA_SIZING=-Xms64M -Xmx512M -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m"
+    set "JBOSS_JAVA_SIZING=-Xms64M -Xmx512M -XX:MetaspaceSize=96M"
 )
 set "JAVA_OPTS=%JBOSS_JAVA_SIZING%"
 

diff --git a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.ps1 b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.ps1
@@ -39,7 +39,7 @@ if (-Not $JAVA_OPTS) {
     $JAVA_OPTS = @()
 
     if (-Not(test-path env:JBOSS_JAVA_SIZING)) {
-        $env:JBOSS_JAVA_SIZING = "-Xms64M -Xmx512M -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m"
+        $env:JBOSS_JAVA_SIZING = "-Xms64M -Xmx512M -XX:MetaspaceSize=96M"
     }
     $JAVA_OPTS += String-To-Array($env:JBOSS_JAVA_SIZING)
 

diff --git a/core-feature-pack/galleon-common/src/main/resources/feature_groups/host-jvm.xml b/core-feature-pack/galleon-common/src/main/resources/feature_groups/host-jvm.xml
@@ -10,6 +10,6 @@
         <param name="heap-size" value="64m"/>
         <param name="max-heap-size" value="256m"/>
         <param name="environment-variables" value="{MALLOC_ARENA_MAX=1}"/>
-        <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;,&quot;-XX:MaxMetaspaceSize=256m&quot;]"/>
+        <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
     </feature>
 </feature-group-spec>
diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
 
         <!-- Surefire args -->
         <surefire.jpda.args></surefire.jpda.args>
-        <surefire.jvm.args>${modular.jdk.args} ${modular.jdk.props} -ea -Duser.region=US -Duser.language=en -Duser.timezone=America/Chicago -XX:MaxMetaspaceSize=256m
+        <surefire.jvm.args>${modular.jdk.args} ${modular.jdk.props} -ea -Duser.region=US -Duser.language=en -Duser.timezone=America/Chicago
             ${surefire.jacoco.args} -Djava.io.tmpdir=${project.build.directory}</surefire.jvm.args>
         <surefire.system.args>${surefire.jpda.args} ${surefire.jvm.args}</surefire.system.args>
         <test.level>INFO</test.level>

diff --git a/...ent-old-server/src/test/java/org/wildfly/client/old/server/util/OldVersionTestRunner.java b/...ent-old-server/src/test/java/org/wildfly/client/old/server/util/OldVersionTestRunner.java
@@ -233,7 +233,7 @@ private void setupServer() {
                 }
                 System.setProperty(LEGACY_JAVA_HOME, jdkHome);
 
-                System.setProperty("jvm.args", "-Xmx512m -XX:MaxMetaspaceSize=256m");
+                System.setProperty("jvm.args", "-Xmx512m");
             } else {
                 System.clearProperty(LEGACY_JAVA_HOME);
             }

diff --git a/...suite/domain/src/test/java/org/jboss/as/test/integration/respawn/RespawnHttpTestCase.java b/...suite/domain/src/test/java/org/jboss/as/test/integration/respawn/RespawnHttpTestCase.java
@@ -140,7 +140,6 @@ public static void createProcessController() throws IOException, URISyntaxExcept
         TestSuiteEnvironment.getIpv6Args(args);
         args.add("-Xms64m");
         args.add("-Xmx512m");
-        args.add("-XX:MaxMetaspaceSize=256m");
         String cliJvmArgs = System.getProperty("cli.jvm.args");
         if (cliJvmArgs != null && !cliJvmArgs.trim().isEmpty()) {
             args.addAll(Arrays.asList(cliJvmArgs.split("\\s+")));

diff --git a/testsuite/domain/src/test/java/org/jboss/as/test/integration/respawn/RespawnTestCase.java b/testsuite/domain/src/test/java/org/jboss/as/test/integration/respawn/RespawnTestCase.java
@@ -144,7 +144,6 @@ public static void createProcessController() throws IOException, URISyntaxExcept
         TestSuiteEnvironment.getIpv6Args(args);
         args.add("-Xms64m");
         args.add("-Xmx512m");
-        args.add("-XX:MaxMetaspaceSize=256m");
         String cliJvmArgs = System.getProperty("cli.jvm.args");
         if (cliJvmArgs != null && !cliJvmArgs.trim().isEmpty()) {
             args.addAll(Arrays.asList(cliJvmArgs.split("\\s+")));

diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron-no-legacy-realms.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron-no-legacy-realms.xml
@@ -66,7 +66,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
@@ -55,7 +55,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-1way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-1way-elytron.xml
@@ -57,7 +57,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-2way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-2way-elytron.xml
@@ -57,7 +57,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml
@@ -68,8 +68,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-1way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-1way-elytron.xml
@@ -74,7 +74,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-2way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-2way-elytron.xml
@@ -74,7 +74,6 @@
             <jvm-options>
                 <option value="-server"/>
                 <option value="-XX:MetaspaceSize=96m"/>
-                <option value="-XX:MaxMetaspaceSize=256m"/>
             </jvm-options>
         </jvm>
     </jvms>

diff --git a/...de/src/test/java/org/jboss/as/test/manualmode/cli/boot/ops/CliBootOperationsTestCase.java b/...de/src/test/java/org/jboss/as/test/manualmode/cli/boot/ops/CliBootOperationsTestCase.java
@@ -39,7 +39,7 @@
 @ServerControl(manual = true)
 public class CliBootOperationsTestCase {
     // Taken from org.wildfly.core.testrunner.Server
-    private static final String DEFAULT_JVM_ARGS =  "-Xmx512m -XX:MaxMetaspaceSize=256m";
+    private static final String DEFAULT_JVM_ARGS =  "-Xmx512m";
 
     @Inject
     protected ServerController container;

diff --git a/...ava/org/jboss/as/test/integration/domain/management/util/WildFlyManagedConfiguration.java b/...ava/org/jboss/as/test/integration/domain/management/util/WildFlyManagedConfiguration.java
@@ -55,7 +55,7 @@ private static URI toURI(URL url) {
 
     private String modulePath = System.getProperty("module.path");
 
-    private String javaVmArguments = System.getProperty("server.jvm.args", "-Xmx512m -XX:MaxMetaspaceSize=256m");
+    private String javaVmArguments = System.getProperty("server.jvm.args", "-Xmx512m");
 
     private int startupTimeoutInSeconds = TimeoutUtil.adjust(120);
 

diff --git a/testsuite/test-runner/src/main/java/org/wildfly/core/testrunner/Server.java b/testsuite/test-runner/src/main/java/org/wildfly/core/testrunner/Server.java
@@ -71,7 +71,7 @@ public class Server {
 
     private final String jbossHome = System.getProperty("jboss.home", System.getenv("JBOSS_HOME"));
     private final String modulePath = System.getProperty("module.path");
-    private final String jvmArgs = System.getProperty("jvm.args", "-Xmx512m -XX:MaxMetaspaceSize=256m");
+    private final String jvmArgs = System.getProperty("jvm.args", "-Xmx512m");
     private final String jbossArgs = System.getProperty("jboss.args");
     private final String javaHome = System.getProperty("java.home", System.getenv("JAVA_HOME"));
     //Use this when specifying an older java to be used for running the server