Merge pull request #798 from VirtualFlyBrain/pipeline2-sync-7314

sync: pipeline2 with pipeline2-sync-7314
VirtualFlyBrain · Nov 20, 2020 · 9bb90e5 · 9bb90e5
2 parents 867da0f + afb462f
commit 9bb90e5
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/dockerFiles/startup.sh b/dockerFiles/startup.sh
@@ -61,8 +61,12 @@ then
     cd $HOME/workspace/org.geppetto/utilities/source_setup && python update_server.py
 
     # set java memory maximum
-    sed 's/XX:MaxPermSize=512m/XX:MaxPermSize=$MAXSIZE/g' -i $SERVER_HOME/bin/dmk.sh
-    sed 's/Xmx1024m/Xmx$MAXSIZE/' -i $SERVER_HOME/bin/dmk.sh
+    sed "s/XX:MaxPermSize=512m/XX:MaxMetaspaceSize=${MAXSIZE,,}/g" -i $SERVER_HOME/bin/dmk.sh
+    sed "s/Xmx1024m/Xmx${MAXSIZE,,}/g" -i $SERVER_HOME/bin/dmk.sh
+    # shutdown on catastrophic out of memory error
+    sed 's/XX:+HeapDumpOnOutOfMemoryError/XX:OnOutOfMemoryError="shutdown -r"/g' -i $SERVER_HOME/bin/dmk.sh
+    # output error to the main log
+    sed 's@ErrorFile="$KERNEL_HOME/serviceability/error.log"@ErrorFile="$SERVER_HOME/serviceability/logs/log.log"@g' -i $SERVER_HOME/bin/dmk.sh
 
     # output log
     tail -F --retry $SERVER_HOME/serviceability/logs/log.log || true &