Changes for 6Gxms

radixdlt · Feb 26, 2025 · 941c6e2 · 941c6e2
1 parent 44113b2
commit 941c6e2
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/node-runner-cli/config/CoreDockerConfig.py b/node-runner-cli/config/CoreDockerConfig.py
@@ -28,7 +28,7 @@ def __init__(self, config_dict: dict):
         self.engine_state_api_port: str = "3336"
         self.engine_state_api_address: str = "0.0.0.0"
         self.java_opts: str = (
-            "--enable-preview -server -Xms12g -Xmx12g  "
+            "--enable-preview -server -Xms6g -Xmx6g  "
             "-XX:MaxDirectMemorySize=2048m "
             "-XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops "
             "-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts "

diff --git a/node-runner-cli/config/CoreSystemDConfig.py b/node-runner-cli/config/CoreSystemDConfig.py
@@ -30,7 +30,7 @@ def __init__(self, config_dict: dict):
         self.engine_state_api_port: str = "3336"
         self.engine_state_api_address: str = "0.0.0.0"
         self.java_opts: str = (
-            "--enable-preview -server -Xms12g -Xmx12g  "
+            "--enable-preview -server -Xms6g -Xmx6g  "
             "-XX:MaxDirectMemorySize=2048m "
             "-XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops "
             "-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts "

diff --git a/node-runner-cli/setup/DockerSetup.py b/node-runner-cli/setup/DockerSetup.py
@@ -495,10 +495,10 @@ def verify_memory_settings_migration(docker_config: DockerConfig):
                     ):
                         if Prompts.ask_temporary_mem_limits_update():
                             docker_config.core_node.memory_limit = "14000m"
-                    if "-Xms12g -Xmx12g" in docker_config.core_node.java_opts:
+                    if "-Xms6g -Xmx6g" in docker_config.core_node.java_opts:
                         if Prompts.ask_temporary_java_opts_update():
                             docker_config.core_node.java_opts = (
-                                "--enable-preview -server -Xms12g -Xmx12g  "
+                                "--enable-preview -server -Xms6g -Xmx6g  "
                                 "-XX:MaxDirectMemorySize=2048m "
                                 "-XX:+HeapDumpOnOutOfMemoryError -XX:+UseCompressedOops "
                                 "-Djavax.net.ssl.trustStore=/etc/ssl/certs/java/cacerts "

diff --git a/node-runner-cli/setup/SystemDSetup.py b/node-runner-cli/setup/SystemDSetup.py
@@ -663,10 +663,10 @@ def verify_memory_settings_migration(settings: SystemDConfig):
         if settings != None:
             if settings.migration != None:
                 if settings.migration.use_olympia:
-                    if "-Xms12g -Xmx12g" in settings.core_node.java_opts:
+                    if "-Xms6g -Xmx6g" in settings.core_node.java_opts:
                         if Prompts.ask_temporary_java_opts_update():
                             settings.core_node.java_opts = (
-                                "--enable-preview -server -Xms12g -Xmx12g  "
+                                "--enable-preview -server -Xms6g -Xmx6g  "
                                 "-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 -Xms12g -Xmx12g  -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 -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'}}
       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 -Xms12g -Xmx12g  -XX:MaxDirectMemorySize=2048m
+  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
   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 -Xms12g -Xmx12g  -XX:MaxDirectMemorySize=2048m
+  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
   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 -Xms12g -Xmx12g  -XX:MaxDirectMemorySize=2048m
+  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
   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 -Xms12g -Xmx12g  -XX:MaxDirectMemorySize=2048m
+      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
       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 -Xms12g -Xmx12g  -XX:MaxDirectMemorySize=2048m
+  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
   keydetails:

diff --git a/node-runner-cli/tests/unit/test_docker.py b/node-runner-cli/tests/unit/test_docker.py
@@ -95,7 +95,7 @@ def test_docker_java_opts_not_migration_are_same_as_for_migration(self):
         settings.common_config.nginx_settings.release = "test"
         docker_compose_yaml = DockerSetup.render_docker_compose(settings)
         java_opts = docker_compose_yaml["services"]["core"]["environment"]["JAVA_OPTS"]
-        self.assertRegex(java_opts, ".*-Xms12g -Xmx12g.*")
+        self.assertRegex(java_opts, ".*-Xms6g -Xmx6g.*")
 
     def test_docker_java_opts_increased_on_migration(self):
         self.maxDiff = None
@@ -107,7 +107,7 @@ def test_docker_java_opts_increased_on_migration(self):
         )
         docker_compose_yaml = DockerSetup.render_docker_compose(settings)
         java_opts = docker_compose_yaml["services"]["core"]["environment"]["JAVA_OPTS"]
-        self.assertRegex(java_opts, ".*-Xms12g -Xmx12g.*")
+        self.assertRegex(java_opts, ".*-Xms6g -Xmx6g.*")
 
     def test_docker_mem_limits_increased_on_migration(self):
         self.maxDiff = None

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 -Xms12g -Xmx12g  -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 -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"
 RADIX_NODE_KEYSTORE_PASSWORD=nowthatyouknowmysecretiwillfollowyouuntilyouforgetit"""
         self.maxDiff = None
         self.assertEqual(fixture, render_template)
@@ -426,7 +426,7 @@ def test_systemd_java_opts_normal_not_on_migration(self):
         settings.core_node.core_release = "test"
         settings.common_config.nginx_settings.release = "test"
         environment_yaml = settings.create_environment_yaml()
-        self.assertTrue("-Xms12g -Xmx12g" in environment_yaml)
+        self.assertTrue("-Xms6g -Xmx6g" in environment_yaml)
 
     def test_systemd_java_opts_increased_on_migration(self):
         self.maxDiff = None
@@ -437,7 +437,7 @@ def test_systemd_java_opts_increased_on_migration(self):
             settings, "someurl", "someuser", "somepassword", "somebech32address"
         )
         environment_yaml = settings.create_environment_yaml()
-        self.assertTrue("-Xms12g -Xmx12g" in environment_yaml)
+        self.assertTrue("-Xms6g -Xmx6g" in environment_yaml)
 
     @responses.activate
     def test_systemd_version_update(self):