From aa99875ee4591370dd3d735ffda1a501aaf5f280 Mon Sep 17 00:00:00 2001 From: Merritt Krakowitzer Date: Thu, 27 Feb 2014 11:04:57 +0200 Subject: [PATCH] Add support to set initial Java heap size --- manifests/init.pp | 1 + templates/setenv.sh.erb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 2e35b4dc..40d722bc 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -73,6 +73,7 @@ # JVM Settings $javahome, + $jvm_xms = '256m', $jvm_xmx = '1024m', $jvm_optional = '-XX:-HeapDumpOnOutOfMemoryError', diff --git a/templates/setenv.sh.erb b/templates/setenv.sh.erb index 4c44d910..dee88366 100755 --- a/templates/setenv.sh.erb +++ b/templates/setenv.sh.erb @@ -11,7 +11,7 @@ JVM_SUPPORT_RECOMMENDED_ARGS="<%= scope.lookupvar('jira::jvm_optional') %>" # # The following 2 settings control the minimum and maximum given to the JIRA Java virtual machine. In larger JIRA instances, the maximum amount will need to be increased. # -JVM_MINIMUM_MEMORY="256m" +JVM_MINIMUM_MEMORY="<%= scope.lookupvar('jira::jvm_xms') %>" JVM_MAXIMUM_MEMORY="<%= scope.lookupvar('jira::jvm_xmx') %>" #