remove JMX settings

radixdlt · Feb 27, 2025 · e7f5386 · e7f5386
1 parent 941c6e2
commit e7f5386
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/node-runner-cli/setup/SystemDSetup.py b/node-runner-cli/setup/SystemDSetup.py
@@ -666,7 +666,7 @@ def verify_memory_settings_migration(settings: SystemDConfig):
                     if "-Xms6g -Xmx6g" in settings.core_node.java_opts:
                         if Prompts.ask_temporary_java_opts_update():
                             settings.core_node.java_opts = (
-                                "--enable-preview -server -Xms6g -Xmx6g  "
+                                "--enable-preview -server  "
                                 "-XX:MaxDirectMemorySize=2048m "
                                 "-XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops "
                                 "-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts "

diff --git a/node-runner-cli/templates/radix-fullnode-compose.yml.j2 b/node-runner-cli/templates/radix-fullnode-compose.yml.j2
@@ -14,7 +14,7 @@ services:
       - {{core_node.advanced_user_envs}}
     {% endif %} 
     environment:
-      JAVA_OPTS: {{core_node.java_opts or '--enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector'}}
+      JAVA_OPTS: {{core_node.java_opts or '--enable-preview -server  -XX:MaxDirectMemorySize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector'}}
       RADIXDLT_CORE_API_PORT: {{core_node.core_api_port}}
       RADIXDLT_SYSTEM_API_PORT: {{core_node.system_api_port}}
       RADIXDLT_LOG_LEVEL: {{core_node.log_level or 'info'}}

diff --git a/node-runner-cli/tests/e2e/configs/expected/core_config.yaml b/node-runner-cli/tests/e2e/configs/expected/core_config.yaml
@@ -14,7 +14,7 @@ core_node:
   composefileurl: ''
   core_release: rcnet-v3.1-r1
   data_directory: /Users/santi/babylon-ledger
-  java_opts: --enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m
+  java_opts: --enable-preview -server  -XX:MaxDirectMemorySize=2048m
     -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
     -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
   keydetails:

diff --git a/node-runner-cli/tests/e2e/configs/expected/gateway_config.yml b/node-runner-cli/tests/e2e/configs/expected/gateway_config.yml
@@ -14,7 +14,7 @@ core_node:
   composefileurl: ''
   core_release: rcnet-v3.1-r1
   data_directory: /Users/santi/babylon-ledger
-  java_opts: --enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m
+  java_opts: --enable-preview -server  -XX:MaxDirectMemorySize=2048m
     -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
     -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
   keydetails:

diff --git a/node-runner-cli/tests/fixtures/config-gateway-docker.yaml b/node-runner-cli/tests/fixtures/config-gateway-docker.yaml
@@ -14,7 +14,7 @@ core_node:
   composefileurl: ''
   core_release: rcnet-v3.1-r1
   data_directory: /home/radixdlt/babylon-ledger
-  java_opts: --enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m
+  java_opts: --enable-preview -server  -XX:MaxDirectMemorySize=2048m
     -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
     -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
   keydetails:

diff --git a/node-runner-cli/tests/fixtures/docker-compose.yaml b/node-runner-cli/tests/fixtures/docker-compose.yaml
@@ -4,7 +4,7 @@ services:
     cap_add:
     - NET_ADMIN
     environment:
-      JAVA_OPTS: --enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m
+      JAVA_OPTS: --enable-preview -server  -XX:MaxDirectMemorySize=2048m
         -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
         -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
       RADIXDLT_CORE_API_PORT: 3333

diff --git a/node-runner-cli/tests/fixtures/docker-config.yaml b/node-runner-cli/tests/fixtures/docker-config.yaml
@@ -15,7 +15,7 @@ common_config:
 core_node:
   core_release: release-birch-ffbc9b5273
   data_directory: /home/radixdlt/data
-  java_opts: --enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m
+  java_opts: --enable-preview -server  -XX:MaxDirectMemorySize=2048m
     -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts
     -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
   keydetails:

diff --git a/node-runner-cli/tests/unit/test_systemd.py b/node-runner-cli/tests/unit/test_systemd.py
@@ -371,7 +371,7 @@ def test_systemd_service_file_jinja(self, mockout):
             .render(settings.to_dict())
             .rendered
         )
-        fixture = f"""JAVA_OPTS="--enable-preview -server -Xms6g -Xmx6g  -XX:MaxDirectMemorySize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
+        fixture = f"""JAVA_OPTS="--enable-preview -server  -XX:MaxDirectMemorySize=2048m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops -Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts -Djavax.net.ssl.trustStoreType=jks -Djava.security.egd=file:/dev/urandom -DLog4jContextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector"
 RADIX_NODE_KEYSTORE_PASSWORD=nowthatyouknowmysecretiwillfollowyouuntilyouforgetit"""
         self.maxDiff = None
         self.assertEqual(fixture, render_template)