SOLR-16505: Switch UpdateShardHandler.getRecoveryOnlyHttpClient to Jetty HTTP2

solr/CHANGES.txt

@@ -176,6 +176,15 @@ Other Changes
 
 * SOLR-17190: Replace org.apache.solr.util.LongSet with hppc LongHashSet (Michael Gibney)
 
+* SOLR-12089: Update FileBasedSpellChecker and IndexBasedSpellChecker to accept accuracy parameter
+  as float; deprecate `breakSugestionTieBreaker` parameter in favor of `breakSuggestionTieBreaker`
+  in WordBreakSolrSpellChecker (Andrey Bozhko via Eric Pugh)
+
+* SOLR-17201: Http2SolrClient and friends no longer marked as @lucene.experimental.
+  Krb5HttpClientBuilder and PreemptiveBasicAuthClientBuilderFactory no longer deprecated (janhoy)
+
+* SOLR-17217: Simplify verbose MatcherAssert.assertThat usage in tests (hossman)
+
 * SOLR-16505: Switch internal replica recovery commands to Jetty HTTP2 (Sanjay Dutt, David Smiley)
 
 ==================  9.5.0 ==================

solr/core/src/java/org/apache/solr/handler/IndexFetcher.java

@@ -132,7 +132,6 @@
 import org.apache.solr.util.RTimer;
 import org.apache.solr.util.RefCounted;
 import org.apache.solr.util.TestInjection;
-import org.apache.solr.util.stats.InstrumentedHttpListenerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -260,13 +259,11 @@ public String getMessage() {
     }
   }
 
-  private Http2SolrClient createHttpClient(
+  private SolrClient createSolrClient(
       SolrCore core, String httpBasicAuthUser, String httpBasicAuthPassword, String leaderBaseUrl) {
     final ModifiableSolrParams httpClientParams = new ModifiableSolrParams();
     httpClientParams.set(HttpClientUtil.PROP_BASIC_AUTH_USER, httpBasicAuthUser);
     httpClientParams.set(HttpClientUtil.PROP_BASIC_AUTH_PASS, httpBasicAuthPassword);
-    // no metrics, just tracing
-    InstrumentedHttpListenerFactory httpListenerFactory = new InstrumentedHttpListenerFactory(null);
     Http2SolrClient httpClient =
         new Http2SolrClient.Builder(leaderBaseUrl)
             .withHttpClient(
@@ -275,7 +272,6 @@ private Http2SolrClient createHttpClient(
             .withIdleTimeout(soTimeout, TimeUnit.MILLISECONDS)
             .withConnectionTimeout(connTimeout, TimeUnit.MILLISECONDS)
             .build();
-    httpClient.addListenerFactory(httpListenerFactory);
     return httpClient;
   }
 
@@ -321,7 +317,7 @@ public IndexFetcher(
     String httpBasicAuthUser = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_USER);
     String httpBasicAuthPassword = (String) initArgs.get(HttpClientUtil.PROP_BASIC_AUTH_PASS);
     solrClient =
-        createHttpClient(solrCore, httpBasicAuthUser, httpBasicAuthPassword, leaderBaseUrl);
+        createSolrClient(solrCore, httpBasicAuthUser, httpBasicAuthPassword, leaderBaseUrl);
   }
 
   private void setLeaderCoreUrl(String leaderCoreUrl) {
@@ -379,7 +375,6 @@ public NamedList<Object> getLatestVersion() throws IOException {
     params.set(CommonParams.QT, ReplicationHandler.PATH);
     QueryRequest req = new QueryRequest(params);
     req.setBasePath(leaderBaseUrl);
-    if (useExternalCompression) req.addHeader("Accept-Encoding", "gzip, deflate");
     // TODO modify to use shardhandler
     try {
       return solrClient.request(req, leaderCoreName);
@@ -401,7 +396,6 @@ private void fetchFileList(long gen) throws IOException {
     params.set(CommonParams.QT, ReplicationHandler.PATH);
     QueryRequest req = new QueryRequest(params);
     req.setBasePath(leaderBaseUrl);
-    if (useExternalCompression) req.addHeader("Accept-Encoding", "gzip, deflate");
     // TODO modify to use shardhandler
     try {
       NamedList<?> response = solrClient.request(req, leaderCoreName);
@@ -1793,10 +1787,10 @@ public void fetchFile() throws Exception {
     private void fetch() throws Exception {
       try {
         while (true) {
-          int result;
-          try (FastInputStream is = getStream()) {
+          try (FastInputStream fis = getStream()) {
+            int result;
             // fetch packets one by one in a single request
-            result = fetchPackets(is);
+            result = fetchPackets(fis);
             if (result == 0 || result == NO_CONTENT) {
               return;
             }
@@ -1820,6 +1814,7 @@ private void fetch() throws Exception {
     private int fetchPackets(FastInputStream fis) throws Exception {
       byte[] intbytes = new byte[4];
       byte[] longbytes = new byte[8];
+      boolean isContentReceived = false;
       try {
         while (true) {
           if (stop) {
@@ -1828,13 +1823,17 @@ private int fetchPackets(FastInputStream fis) throws Exception {
             throw new ReplicationHandlerException("User aborted replication");
           }
           long checkSumServer = -1;
+
           fis.readFully(intbytes);
+
           // read the size of the packet
           int packetSize = readInt(intbytes);
           if (packetSize <= 0) {
-            log.warn("No content received for file: {}", fileName);
+            fis.read(); // read till end-of-file
+            if (!isContentReceived) log.warn("No content received for file: {}", fileName);
             return NO_CONTENT;
           }
+          isContentReceived = true;
           // TODO consider recoding the remaining logic to not use/need buf[]; instead use the
           // internal buffer of fis
           if (buf.length < packetSize) {
@@ -1867,7 +1866,6 @@ private int fetchPackets(FastInputStream fis) throws Exception {
           log.debug("Fetched and wrote {} bytes of file: {}", bytesDownloaded, fileName);
           // errorCount is always set to zero after a successful packet
           errorCount = 0;
-          if (bytesDownloaded >= size) return 0;
         }
       } catch (ReplicationHandlerException e) {
         throw e;
@@ -1956,7 +1954,7 @@ private void cleanup() {
     private FastInputStream getStream() throws IOException {
       ModifiableSolrParams params = new ModifiableSolrParams();
 
-      //    //the method is command=filecontent
+      // the method is command=filecontent
       params.set(COMMAND, CMD_GET_FILE);
       params.set(GENERATION, Long.toString(indexGen));
       params.set(CommonParams.QT, ReplicationHandler.PATH);
@@ -1984,7 +1982,7 @@ private FastInputStream getStream() throws IOException {
         QueryRequest req = new QueryRequest(params);
         req.setResponseParser(new InputStreamResponseParser(FILE_STREAM));
         req.setBasePath(leaderBaseUrl);
-        if (useExternalCompression) req.addHeader("Accept-Encoding", "gzip, deflate");
+        if (useExternalCompression) req.addHeader("Accept-Encoding", "gzip");
         response = solrClient.request(req, leaderCoreName);
         is = (InputStream) response.get("stream");
         if (useInternalCompression) {
@@ -2111,7 +2109,6 @@ NamedList<Object> getDetails() throws IOException, SolrServerException {
 
     QueryRequest request = new QueryRequest(params);
     request.setBasePath(leaderBaseUrl);
-    if (useExternalCompression) request.addHeader("Accept-Encoding", "gzip, deflate");
     // TODO use shardhandler
     return solrClient.request(request, leaderCoreName);
   }

solr/core/src/test/org/apache/solr/handler/ReplicationTestHelper.java

@@ -103,7 +103,8 @@ private static void copyFile(File src, File dst, Integer port, boolean internalC
         if (null != port) {
           line = line.replace("TEST_PORT", port.toString());
         }
-        line = line.replace("COMPRESSION", internalCompression ? "internal" : "false");
+        String externalCompression = LuceneTestCase.random().nextBoolean() ? "external" : "false";
+        line = line.replace("COMPRESSION", internalCompression ? "internal" : externalCompression);
         out.write(line);
       }
     }

solr/solrj/src/java/org/apache/solr/client/solrj/impl/Http2SolrClient.java

@@ -137,18 +137,13 @@ protected Http2SolrClient(String serverBaseUrl, Builder builder) {
       this.httpClient = createHttpClient(builder);
       this.closeClient = true;
     }
-
-    updateDefaultMimeTypeForParser();
-
-    this.httpClient.setFollowRedirects(Boolean.TRUE.equals(builder.followRedirects));
-    if (builder.urlParamNames != null) {
-      this.urlParamNames = builder.urlParamNames;
-    } else {
-      this.urlParamNames = Set.of();
-    }
     if (builder.listenerFactory != null) {
       this.listenerFactory.addAll(builder.listenerFactory);
     }
+    updateDefaultMimeTypeForParser();
+
+    this.httpClient.setFollowRedirects(Boolean.TRUE.equals(builder.followRedirects));
+
     assert ObjectReleaseTracker.track(this);
   }
 
@@ -809,9 +804,17 @@ public static class Builder
 
     private HttpClient httpClient;
 
+    protected CookieStore cookieStore;
+
+    private SSLConfig sslConfig;
+
+    protected Long keyStoreReloadIntervalSecs;
+
     private List<HttpListenerFactory> listenerFactory;
 
-    public Builder() {}
+    public Builder() {
+      super();
+    }
 
     /**
      * Initialize a Builder object, based on the provided Solr URL.
@@ -983,6 +986,7 @@ private void httpClientBuilderSetup(Http2SolrClient client) {
      */
     public Builder withHttpClient(Http2SolrClient http2SolrClient) {
       this.httpClient = http2SolrClient.httpClient;
+
       if (this.basicAuthAuthorizationStr == null) {
         this.basicAuthAuthorizationStr = http2SolrClient.basicAuthAuthorizationStr;
       }