PI-2573 Use LS_JAVA_OPTS instead of JDK_JAVA_OPTIONS in Logstash

Before: ``` JVM bootstrap flags: [-XX:MaxRAMPercentage=75.0, -Xms1g, -Xmx1g, ... ``` After: ``` JVM bootstrap flags: [-Xms1g, -Xmx1g, ..., -Xms3g, -Xmx3g, ... ```
ministryofjustice · Oct 10, 2024 · be88772 · be88772
1 parent 7854f5a
commit be88772
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/projects/person-search-index-from-delius/deploy/templates/contact-reindex-cronjob.yml b/projects/person-search-index-from-delius/deploy/templates/contact-reindex-cronjob.yml
@@ -31,8 +31,8 @@ spec:
               env:
                 - name: AWS_REGION
                   value: eu-west-2
-                - name: JDK_JAVA_OPTIONS
-                  value: -XX:MaxRAMPercentage=75.0
+                - name: LS_JAVA_OPTS
+                  value: -Xms3g -Xmx3g # = 75% of pod memory limit (see above)
                 - name: SENTRY_ENVIRONMENT
                   value: {{ .Values.reindexing.sentry_environment }}
                 - name: CONTACT_INDEX_PREFIX

diff --git a/projects/person-search-index-from-delius/deploy/templates/person-reindex-cronjob.yml b/projects/person-search-index-from-delius/deploy/templates/person-reindex-cronjob.yml
@@ -31,8 +31,8 @@ spec:
               env:
                 - name: AWS_REGION
                   value: eu-west-2
-                - name: JDK_JAVA_OPTIONS
-                  value: -XX:MaxRAMPercentage=75.0
+                - name: LS_JAVA_OPTS
+                  value: -Xms3g -Xmx3g # = 75% of pod memory limit (see above)
                 - name: SENTRY_ENVIRONMENT
                   value: {{ .Values.reindexing.sentry_environment }}
                 - name: PERSON_INDEX_PREFIX

diff --git a/projects/person-search-index-from-delius/deploy/values.yaml b/projects/person-search-index-from-delius/deploy/values.yaml
@@ -29,7 +29,8 @@ generic-service:
     CONTACT_INDEX_PREFIX: contact-search
     PERSON_INDEX_PREFIX: person-search
     PIPELINES_ENABLED: person-incremental,contact-incremental
-    JDK_JAVA_OPTIONS: -XX:MaxRAMPercentage=75.0
+    JDK_JAVA_OPTIONS: ''
+    LS_JAVA_OPTS: -Xms1536m -Xmx1536m # = 75% of pod memory limit (see above)
 
   namespace_secrets:
     common: