Adjusted Elasticsearch JVM options to flow from crafter-setenv.sh.

Euquimides · Oct 12, 2021 · 8b53ec5 · 8b53ec5
1 parent c2d0273
commit 8b53ec5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/environments.gradle b/environments.gradle
@@ -285,6 +285,15 @@ ext.commonConfUpdatePatterns = [
                         'xpack.ml.enabled: false' + System.lineSeparator()
             ]
         ]
+    ],
+    [
+            confFile: "/bin/elasticsearch/config/jvm.options",
+            patterns: [
+                    [
+                            match: "-Xm",
+                            replace: '#-Xm'
+                    ]
+            ]
     ]
 ]
 

diff --git a/resources/env/authoring/bin/crafter-setenv.sh b/resources/env/authoring/bin/crafter-setenv.sh
@@ -47,7 +47,7 @@ export PROFILE_URL=${PROFILE_URL:="http://$TOMCAT_HOST:$TOMCAT_HTTP_PORT/crafter
 export SOCIAL_URL=${SOCIAL_URL:="http://$TOMCAT_HOST:$TOMCAT_HTTP_PORT/crafter-social"}
 
 # -------------------- Java opts --------------------
-export ES_JAVA_OPTS=${ES_JAVA_OPTS:="-server -Xss1024K -Xmx1G"}
+export ES_JAVA_OPTS=${ES_JAVA_OPTS:="-server -Xss1024K -Xms1G -Xmx1G"}
 export DEPLOYER_JAVA_OPTS=${DEPLOYER_JAVA_OPTS:="-server -Xss1024K -Xmx1G"}
 export CATALINA_OPTS=${CATALINA_OPTS:="-server -Xss1024K -Xms1G -Xmx4G"}
 

diff --git a/resources/env/delivery/bin/crafter-setenv.sh b/resources/env/delivery/bin/crafter-setenv.sh
@@ -44,7 +44,7 @@ export PROFILE_URL=${PROFILE_URL:="http://$TOMCAT_HOST:$TOMCAT_HTTP_PORT/crafter
 export SOCIAL_URL=${SOCIAL_URL:="http://$TOMCAT_HOST:$TOMCAT_HTTP_PORT/crafter-social"}
 
 # -------------------- Java opts --------------------
-export ES_JAVA_OPTS=${ES_JAVA_OPTS:="-server -Xss1024K -Xmx1G"}
+export ES_JAVA_OPTS=${ES_JAVA_OPTS:="-server -Xss1024K -Xms1G -Xmx1G"}
 export DEPLOYER_JAVA_OPTS=${DEPLOYER_JAVA_OPTS:="-server -Xss1024K -Xmx1G"}
 export CATALINA_OPTS=${CATALINA_OPTS:="-server -Xss1024K -Xms1G -Xmx2G"}