Implemented #133: Upgrade Solr from 9.2.1 to 9.4.0

searchmysite · Dec 16, 2023 · 206ba26 · 206ba26
1 parent 4b390f2
commit 206ba26
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 59 deletions.
diff --git a/src/search/Dockerfile b/src/search/Dockerfile
@@ -1,4 +1,4 @@
-FROM solr:9.2.1
+FROM solr:9.4.0
 
 # Copy the custom config files in. Note that in order to create the collection with this config, 
 # we need to do a docker run with "solr-precreate content /opt/solr/server/solr/configsets/content"

diff --git a/src/search/content/conf/solrconfig.xml b/src/search/content/conf/solrconfig.xml
@@ -35,7 +35,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
   -->
-  <luceneMatchVersion>9.4</luceneMatchVersion>
+  <luceneMatchVersion>9.8</luceneMatchVersion>
 
   <!-- <lib/> directives can be used to instruct Solr to load any Jars
        identified and use them to resolve any "plugins" specified in
@@ -301,7 +301,7 @@
       -->
 
     <autoSoftCommit>
-      <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+      <maxTime>${solr.autoSoftCommit.maxTime:3000}</maxTime>
     </autoSoftCommit>
 
     <!-- Update Related Event Listeners
@@ -559,52 +559,6 @@
 
   </query>
 
-  <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-     Circuit Breaker Section - This section consists of configurations for
-     circuit breakers
-     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
-  <!-- Circuit breakers are designed to allow stability and predictable query
-     execution. They prevent operations that can take down the node and cause
-     noisy neighbour issues.
-
-     The CircuitBreakerManager is the default manager for all circuit breakers.
-     The enabled flag here controls the activation/deactivation of all circuit
-     breakers specified within.
-  -->
-  <circuitBreaker class="solr.CircuitBreakerManager" enabled="true">
-    <!-- Memory Circuit Breaker
-
-     Specific configuration for max JVM heap usage circuit breaker. This configuration defines
-     whether the circuit breaker is enabled and the threshold percentage of maximum heap allocated
-     beyond which queries will be rejected until the current JVM usage goes below the threshold.
-     The valid value for this range is 50-95.
-
-     Consider a scenario where the max heap allocated is 4 GB and memThreshold is defined as 75.
-     Threshold JVM usage will be 4 * 0.75 = 3 GB. Its generally a good idea to keep this value
-     between 75 - 80% of maximum heap allocated.
-
-     If, at any point, the current JVM heap usage goes above 3 GB, queries will be rejected until
-     the heap usage goes below 3 GB again. If you see queries getting rejected with 503 error code,
-     check for "Circuit Breakers tripped" in logs and the corresponding error message should tell
-     you what transpired (if the failure was caused by tripped circuit breakers).
-    -->
-    <!--
-    <str name="memEnabled">true</str>
-    <str name="memThreshold">75</str>
-    -->
-
-    <!-- CPU Circuit Breaker Configuration
-
-     Specific configuration for CPU utilization based circuit breaker. This configuration defines
-     whether the circuit breaker is enabled and the average load over the last minute at which the
-     circuit breaker should start rejecting queries.
-    -->
-    <!--
-    <str name="cpuEnabled">true</str>
-    <str name="cpuThreshold">75</str>
-    -->
-  </circuitBreaker>
-
   <!-- Request Dispatcher
 
        This section contains instructions for how the SolrDispatchFilter
@@ -618,9 +572,6 @@
          what restrictions may be placed on the ContentStreams from
          those requests
 
-         enableRemoteStreaming - enables use of the stream.file
-         and stream.url parameters for specifying remote streams.
-
          multipartUploadLimitInKB - specifies the max size (in KiB) of
          Multipart File Uploads that Solr will allow in a Request.
 
@@ -636,12 +587,7 @@
          Solr components, but may be useful when developing custom
          plugins.
 
-         *** WARNING ***
-         Before enabling remote streaming, you should make sure your
-         system has authentication enabled.
-
-    <requestParsers enableRemoteStreaming="false"
-                    multipartUploadLimitInKB="-1"
+    <requestParsers multipartUploadLimitInKB="-1"
                     formdataUploadLimitInKB="-1"
                     addHttpRequestToContext="false"/>
       -->
@@ -740,7 +686,7 @@
       <str name="indent">true</str>
     </lst>
   </requestHandler>
-  
+
   <!-- start searchmysite change -->
   <requestHandler name="/mlt" class="solr.MoreLikeThisHandler">
     <str name="mlt.fl">title,description,author,tags,url,content</str>