first pass upgrading to solr 10. Disable querqy, and otel

Author: epugh

docker-compose.yml

@@ -72,12 +72,9 @@ services:
       - SOLR_OPTS=-XX:-UseLargePages
       - SOLR_HEAP=1g
       - ZK_HOST=zoo1:2181,zoo2:2181,zoo3:2181
-      - JAEGER_SERVICE_NAME=solr1  # not working ;-(
-      - JAEGER_SAMPLER_TYPE=const
-      - JAEGER_SAMPLER_PARAM=${JAEGER_SAMPLER_PARAM}
-      - JAEGER_AGENT_HOST=jaeger
-      - JAEGER_AGENT_PORT=5775
-      - "SOLR_OPTS=-Dsolr.auth.jwt.allowOutboundHttp=true -Dsolr.modules=jwt-auth,jaegertracer-configurator"
+      - OTEL_SERVICE_NAME=solr
+      - OTEL_SDK_DISABLED=${OTEL_SDK_DISABLED}
+      - "SOLR_OPTS=-Dsolr.auth.jwt.outbound.http.enabled=true -Dsolr.modules=jwt-auth,opentelemetry"
     depends_on:
       - zoo1
       - zoo2
@@ -93,12 +90,9 @@ services:
       - SOLR_OPTS=-XX:-UseLargePages
       - SOLR_HEAP=1g
       - ZK_HOST=zoo1:2181,zoo2:2181,zoo3:2181
-      - JAEGER_SERVICE_NAME=solr2
-      - JAEGER_SAMPLER_TYPE=const
-      - JAEGER_SAMPLER_PARAM=${JAEGER_SAMPLER_PARAM}
-      - JAEGER_AGENT_HOST=jaeger
-      - JAEGER_AGENT_PORT=5775
-      - "SOLR_OPTS=-Dsolr.auth.jwt.allowOutboundHttp=true -Dsolr.modules=jwt-auth,jaegertracer-configurator"
+      - OTEL_SERVICE_NAME=solr
+      - OTEL_SDK_DISABLED=${OTEL_SDK_DISABLED}
+      - "SOLR_OPTS=-Dsolr.auth.jwt.outbound.http.enabled=true -Dsolr.modules=jwt-auth,opentelemetry"
     depends_on:
       - zoo1
       - zoo2
@@ -114,12 +108,9 @@ services:
       - SOLR_OPTS=-XX:-UseLargePages
       - SOLR_HEAP=1g
       - ZK_HOST=zoo1:2181,zoo2:2181,zoo3:2181
-      - JAEGER_SERVICE_NAME=solr3
-      - JAEGER_SAMPLER_TYPE=const
-      - JAEGER_SAMPLER_PARAM=${JAEGER_SAMPLER_PARAM}
-      - JAEGER_AGENT_HOST=jaeger
-      - JAEGER_AGENT_PORT=5775
-      - "SOLR_OPTS=-Dsolr.auth.jwt.allowOutboundHttp=true -Dsolr.modules=jwt-auth,jaegertracer-configurator"
+      - OTEL_SERVICE_NAME=solr
+      - OTEL_SDK_DISABLED=${OTEL_SDK_DISABLED}
+      - "SOLR_OPTS=-Dsolr.auth.jwt.outbound.http.enabled=true -Dsolr.modules=jwt-auth,opentelemetry"
     depends_on:
       - zoo1
       - zoo2

quickstart.sh

@@ -57,11 +57,11 @@ check_prerequisites
 services="blacklight solr1 solr2 solr3 keycloak"
 
 if $observability; then
-  export JAEGER_SAMPLER_PARAM="1"
+  #export JAEGER_SAMPLER_PARAM="1"
   services="${services} grafana solr-exporter jaeger"
 else
-  # Prevents Jaeger in Solr from attempting to send events.
-  export JAEGER_SAMPLER_PARAM=
+  # Prevents OpenTelementry in Solr from attempting to send events.
+  export OTEL_SDK_DISABLED=true
 fi
 
 if $offline_lab; then
@@ -130,17 +130,15 @@ log_minor "waiting for security.json to be available to all Solr nodes"
 log_major "Packaging ecommerce configset."
 (cd solr/configsets/ecommerce/conf && zip -r - *) > ./solr/configsets/ecommerce.zip
 log_minor "posting ecommerce.zip configset"
-curl  --user solr:SolrRocks -X PUT --header "Content-Type:application/octet-stream" --data-binary @./solr/configsets/ecommerce.zip "http://localhost:8983/api/cluster/configs/ecommerce"
+curl  --user solr:SolrRocks -X PUT --header "Content-Type:application/octet-stream" --data-binary @./solr/configsets/ecommerce.zip "http://localhost:8983/api/configsets/ecommerce"
 log_major "Creating ecommerce collection."
 curl --user solr:SolrRocks -X POST http://localhost:8983/api/collections -H 'Content-Type: application/json' -d'
   {
-    "create": {
-      "name": "ecommerce",
-      "config": "ecommerce",
-      "numShards": 2,
-      "replicationFactor": 1,
-      "waitForFinalState": true
-    }
+    "name": "ecommerce",
+    "config": "ecommerce",
+    "numShards": 2,
+    "replicationFactor": 1,
+    "waitForFinalState": true
   }
 '
 

solr/Dockerfile

@@ -1,7 +1,7 @@
-FROM solr:9.1.1
+FROM solr:10.0.0
 
-COPY --chown=solr:solr solr.xml /var/solr/data/
+#COPY --chown=solr:solr solr.xml /var/solr/data/
 
-COPY ./lib/querqy-solr-5.6.lucene900.0-jar-with-dependencies.jar /opt/querqy/lib/
-COPY ./lib/querqy-embeddings-rewriter-1.0.0-SNAPSHOT.jar /opt/querqy/lib/
-COPY ./lib/querqy-regex-filter-1.1.0-SNAPSHOT.jar /opt/querqy/lib/
+COPY ./lib/querqy-solr-5.6.lucene900.0-jar-with-dependencies.jar /opt/solr-10.0.0/lib
+COPY ./lib/querqy-embeddings-rewriter-1.0.0-SNAPSHOT.jar /opt/solr-10.0.0/lib
+COPY ./lib/querqy-regex-filter-1.1.0-SNAPSHOT.jar /opt/solr-10.0.0/lib

solr/configsets/ecommerce/conf/solrconfig.xml

@@ -8,15 +8,15 @@
   <codecFactory class="solr.SchemaCodecFactory"/>
 
   <!-- Load the Querqy Jar that comes with all it's dependencies -->
-  <lib dir="/opt/querqy/lib/" />
+  <!--lib dir="/opt/querqy/lib/" /-->
 
   <dataDir>${solr.data.dir:}</dataDir>
 
   <directoryFactory name="DirectoryFactory"
                     class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
   <schemaFactory class="ManagedIndexSchemaFactory"/>
 
-  <luceneMatchVersion>8.9</luceneMatchVersion>
+  <luceneMatchVersion>10.0</luceneMatchVersion>
 
   <updateHandler class="solr.DirectUpdateHandler2">
     <commitWithin>
@@ -55,7 +55,7 @@
     <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
   </query>
 
-  <queryParser name="querqy" class="querqy.solr.QuerqyDismaxQParserPlugin">
+  <queryParser name="querqy" class="querqy.solr.QuerqyDismaxQParserPlugin" startup="lazy">
     <bool name="skipUnknownRewriters">true</bool>
     <lst name="infoLogging">
       <!--
@@ -114,12 +114,13 @@
 
 
   <!-- Override the default QueryComponent -->
-  <searchComponent name="query" class="querqy.solr.QuerqyQueryComponent"/>
+  <!-- Need Solr 10 version -->
+  <!--searchComponent name="query" class="querqy.solr.QuerqyQueryComponent"/-->
 
   <!--
     Add the Querqy request handler.
   -->
-  <requestHandler name="/querqy/rewriter" class="querqy.solr.QuerqyRewriterRequestHandler"/>
+  <requestHandler name="/querqy/rewriter" class="querqy.solr.QuerqyRewriterRequestHandler" startup="lazy"/>
 
   <!-- Used in the Solr Admin UI -->
   <requestHandler name="/select" class="solr.SearchHandler">