Merge pull request internetarchive#11188 from cdrini/11168/refactor/update-solr

Update solr to latest version, 9.9.0

Author: mekarpeles

compose.production.yaml

@@ -22,7 +22,8 @@ services:
       - ../olsystem/etc/ia.ini:/home/openlibrary/.config/ia.ini
 
   solr:
-    profiles: ["ol-solr0"]
+    # Disabled while we're updating our version of solr, otherwise it'll pull down the new image!
+    profiles: ["ol-never"]
     environment:
       # More memory for production
       - SOLR_JAVA_MEM=-Xms10g -Xmx10g

compose.yaml

@@ -17,7 +17,7 @@ services:
         max-file: "4"
 
   solr:
-    image: solr:9.5.0
+    image: solr:9.9.0
     expose:
       - 8983
     environment:
@@ -33,6 +33,7 @@ services:
         -Dsolr.autoSoftCommit.maxTime=60000
         -Dsolr.autoCommit.maxTime=120000
         -Dsolr.max.booleanClauses=30000
+      - SOLR_MODULES=analysis-extras
     volumes:
       - solr-data:/var/solr
       - ./conf/solr:/opt/solr/server/solr/configsets/olconfig:ro

conf/solr/conf/solrconfig.xml

@@ -73,9 +73,9 @@
        with their external dependencies.
     -->
     <!-- <lib dir="${solr.install.dir:../../../..}/modules/ltr/lib" regex=".*\.jar" /> -->
-    <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="solr-analysis-extras-\d.*\.jar" />
+    <!-- <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="solr-analysis-extras-\d.*\.jar" />
     <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="lucene-analysis-icu-\d.*\.jar" />
-    <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="icu4j-\d.*\.jar" />
+    <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" regex="icu4j-\d.*\.jar" /> -->
 
   <!-- an exact 'path' can be used instead of a 'dir' to specify a
        specific jar file.  This will cause a serious error to be logged

scripts/solr_builder/compose.yaml

@@ -29,12 +29,13 @@ services:
   solr:
     profiles:
       - build
-    image: solr:9.5.0
+    image: solr:9.9.0
     restart: on-failure
     environment:
       # This is optimized for bulk loading, but should be shortened for production
       # and we should set autoSoftCommit to a value that makes sense for our query usage (5-15 sec?)
       - SOLR_OPTS=-Dsolr.autoCommit.maxTime=3600000
+      - SOLR_MODULES=analysis-extras
       - SOLR_JAVA_MEM=-Xms3g -Xmx3g
     ports:
       - 8983:8983
@@ -53,7 +54,7 @@ services:
     profiles:
       - production
     restart: unless-stopped
-    image: solr:9.5.0
+    image: solr:9.9.0
     expose:
       - 8983
     environment: