revert to java 8

mlibrary · Jan 26, 2024 · 876a196 · 876a196
1 parent 1f9ac79
commit 876a196
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/manifests/profile/hathitrust/lss.pp b/manifests/profile/hathitrust/lss.pp
@@ -3,7 +3,7 @@
 # @example
 #   include nebula::profile::hathitrust::lss
 class nebula::profile::hathitrust::lss (
-  String $jdk_version = '11',
+  String $jdk_version = '8',
   String $solr_home = '/var/lib/solr',
   String $java_home = "/usr/lib/jvm/java-${jdk_version}-openjdk-amd64",
   String $heap = '16G',

diff --git a/spec/classes/profile/hathitrust/lss_spec.rb b/spec/classes/profile/hathitrust/lss_spec.rb
@@ -9,7 +9,7 @@
 
       it { is_expected.to compile }
       # solr and dependencies
-      it { is_expected.to contain_package('openjdk-11-jre-headless') }
+      it { is_expected.to contain_package('openjdk-8-jre-headless') }
       it { is_expected.to contain_package('solr') }
       it { is_expected.to contain_user('solr') }
       it { is_expected.to contain_service('solr') }
@@ -65,7 +65,10 @@
         let(:params) do
           { is_primary_node: false }
         end
-#        it { is_expected.to contain_file('/usr/local/bin/index-release-lss').with_content(%r{^#touch /htapps/babel/flags/web/lss-release-\$\{TODAY\}$}) }
+        it {
+          pending("revert temp new flag")
+          is_expected.to contain_file('/usr/local/bin/index-release-lss').with_content(%r{^#touch /htapps/babel/flags/web/lss-release-\$\{TODAY\}$})
+        }
       end
 
       it { is_expected.to contain_firewall('200 Solr - Private: foobar net').with(source: '192.168.99.0/24') }

diff --git a/templates/profile/hathitrust/solr_lss/solr.in.sh.erb b/templates/profile/hathitrust/solr_lss/solr.in.sh.erb
@@ -3,20 +3,11 @@ SOLR_JAVA_HOME="<%= @java_home %>"
 SOLR_HEAP="<%= @heap %>"
 
 GC_LOG_OPTS=""
-#
-#GC_TUNE="-XX:+UseG1GC \
-#-XX:+PerfDisableSharedMem \
-#-XX:+ParallelRefProcEnabled \
-#-XX:MaxGCPauseMillis=250 \
-#-XX:+UseLargePages \
-#-XX:+AlwaysPreTouch \
-#-XX:+ExplicitGCInvokesConcurrent"
-
-###### solr 8 only
 #GC_LOG_OPTS="-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails \
 #-XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime"
 
 # These GC settings have shown to work well for a number of common Solr workloads
+# They will not work with Java > 8
 GC_TUNE="-XX:NewRatio=3 \
 -XX:SurvivorRatio=4 \
 -XX:TargetSurvivorRatio=90 \
@@ -31,7 +22,6 @@ GC_TUNE="-XX:NewRatio=3 \
 -XX:CMSMaxAbortablePrecleanTime=6000 \
 -XX:+CMSParallelRemarkEnabled \
 -XX:+ParallelRefProcEnabled"
-######
 
 SOLR_TIMEZONE="<%= @timezone %>"
 ENABLE_REMOTE_JMX_OPTS="true"