Merge pull request #241 from SimonHoenscheid/jdk17_jvm_opts

add jdk17 option
voxpupuli · Aug 23, 2024 · 8b65ce6 · 8b65ce6
2 parents 6395abd + 6f4fa13
commit 8b65ce6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -6,7 +6,7 @@
 
   # JVM Settings
   $javahome                                                      = undef,
-  Enum['openjdk-11', 'oracle-jdk-1.8', 'custom'] $jvm_type       = 'openjdk-11',
+  Enum['openjdk-17', 'openjdk-11', 'oracle-jdk-1.8', 'custom'] $jvm_type       = 'openjdk-11',
   $jvm_xms                                                       = '256m',
   $jvm_xmx                                                       = '1024m',
   $jvm_permgen                                                   = '256m',

diff --git a/spec/classes/confluence_config_spec.rb b/spec/classes/confluence_config_spec.rb
@@ -268,6 +268,23 @@
           end
         end
 
+        context 'jdk17 specific option' do
+          let(:params) do
+            {
+              version: '8.5.14',
+              javahome: '/opt/java',
+              jvm_type: 'openjdk-17'
+            }
+          end
+
+          it do
+            is_expected.to compile.with_all_deps
+            is_expected.to contain_file('/opt/confluence/atlassian-confluence-8.5.14/bin/setenv.sh').
+              with_content(%r{CATALINA_OPTS="-XX:\+ExplicitGCInvokesConcurrent \${CATALINA_OPTS}"}).
+              with_content(%r{CATALINA_OPTS="-Xlog:gc\*:file=\$LOGBASEABS/logs/gc-%t.log:tags,time,uptime,level:filecount=5,filesize=2M \${CATALINA_OPTS}"}) # fix this spec test
+          end
+        end
+
         context 'manage_user set to true' do
           let(:params) do
             {

diff --git a/templates/setenv.sh.erb b/templates/setenv.sh.erb
@@ -82,18 +82,22 @@ export JAVA_OPTS
 # Set the JVM arguments used to start Confluence. For a description of the options, see
 # http://www.oracle.com/technetwork/java/javase/tech/vmoptions-jsp-140102.html
 
-<%-   if version[0] >= 7 # 7.x.x or higher -%>
+<%-   if version[0] == 7 # 7.x.x -%>
 <%-     if version[1] >= 1 # 7.1.x or higher -%>
 CATALINA_OPTS="-XX:+IgnoreUnrecognizedVMOptions ${CATALINA_OPTS}"
 CATALINA_OPTS="-Xlog:gc+age=debug:file=$LOGBASEABS/logs/gc-`date +%F_%H-%M-%S`.log::filecount=5,filesize=2M ${CATALINA_OPTS}"
 <%-     end -%>
 <%-   end -%>
-<%- if scope.lookupvar('confluence::jvm_type') == 'openjdk-11' -%>
+<%- if scope.lookupvar('confluence::jvm_type') == 'openjdk-17' -%>
+CATALINA_OPTS="-XX:+ExplicitGCInvokesConcurrent ${CATALINA_OPTS}"
+CATALINA_OPTS="-Xlog:gc*:file=$LOGBASEABS/logs/gc-%t.log:tags,time,uptime,level:filecount=5,filesize=2M ${CATALINA_OPTS}"
+<%- elsif scope.lookupvar('confluence::jvm_type') == 'openjdk-11' -%>
 CATALINA_OPTS="-XX:+ExplicitGCInvokesConcurrent -XX:+PrintGCDateStamps ${CATALINA_OPTS}"
+CATALINA_OPTS="-Xloggc:$LOGBASEABS/logs/gc-`date +%F_%H-%M-%S`.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=2M ${CATALINA_OPTS}"
 <%- elsif scope.lookupvar('confluence::jvm_type')  == 'oracle-jdk-1.8' -%>
 CATALINA_OPTS="-XX:-PrintGCDetails -XX:+PrintGCDateStamps -XX:-PrintTenuringDistribution ${CATALINA_OPTS}"
-<%- end -%>
 CATALINA_OPTS="-Xloggc:$LOGBASEABS/logs/gc-`date +%F_%H-%M-%S`.log -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=2M ${CATALINA_OPTS}"
+<%- end -%>
 CATALINA_OPTS="-XX:G1ReservePercent=20 ${CATALINA_OPTS}"
 CATALINA_OPTS="-Djava.awt.headless=true ${CATALINA_OPTS}"
 CATALINA_OPTS="-Datlassian.plugins.enable.wait=300 ${CATALINA_OPTS}"