Revert "SOLR-17286: Remote Proxy via Jetty HttpClient (#3447)"

This reverts commit 3157010.

Author: dsmiley

solr/CHANGES.txt

@@ -36,8 +36,7 @@ Dependency Upgrades
 
 Other Changes
 ---------------------
-* SOLR-17286: When proxying requests to another node, use Jetty HttpClient not Apache HttpClient.
-  (David Smiley)
+(No changes)
 
 ==================  9.9.1 ==================
 Bug Fixes

solr/benchmark/src/java/org/apache/solr/bench/Docs.java

@@ -26,13 +26,13 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import org.apache.lucene.util.RamUsageEstimator;
 import org.apache.solr.bench.generators.MultiString;
 import org.apache.solr.bench.generators.SolrGen;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.util.CollectionUtil;
-import org.apache.solr.common.util.ExecutorUtil;
 import org.apache.solr.common.util.SolrNamedThreadFactory;
 import org.apache.solr.common.util.SuppressForbidden;
 import org.quicktheories.core.Gen;
@@ -110,7 +110,11 @@ public Iterator<SolrInputDocument> preGenerate(int numDocs) throws InterruptedEx
       executorService.execute(() -> docs.add(Docs.this.inputDocument()));
     }
 
-    ExecutorUtil.shutdownAndAwaitTermination(executorService);
+    executorService.shutdown();
+    boolean result = executorService.awaitTermination(10, TimeUnit.MINUTES);
+    if (!result) {
+      throw new RuntimeException("Timeout waiting for doc adds to finish");
+    }
     log(
         "done preGenerateDocs docs="
             + docs.size()

solr/benchmark/src/test/org/apache/solr/bench/MiniClusterBenchStateTest.java

@@ -26,35 +26,38 @@
 import static org.apache.solr.bench.generators.SourceDSL.strings;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+import java.lang.invoke.MethodHandles;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.concurrent.TimeUnit;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.client.solrj.request.QueryRequest;
 import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.junit.After;
 import org.junit.Test;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.infra.BenchmarkParams;
 import org.openjdk.jmh.infra.IterationParams;
 import org.openjdk.jmh.runner.IterationType;
 import org.openjdk.jmh.runner.WorkloadParams;
 import org.openjdk.jmh.runner.options.TimeValue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 @ThreadLeakLingering(linger = 10)
 public class MiniClusterBenchStateTest extends SolrTestCaseJ4 {
-  private MiniClusterState.MiniClusterBenchState miniBenchState;
-  private BaseBenchState baseBenchState;
-  private BenchmarkParams benchParams;
+  private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
   @Test
   public void testMiniClusterState() throws Exception {
 
     System.setProperty("workBaseDir", createTempDir("work").toString());
     System.setProperty("random.counts", "true");
 
-    miniBenchState = new MiniClusterState.MiniClusterBenchState();
-    benchParams =
+    MiniClusterState.MiniClusterBenchState miniBenchState =
+        new MiniClusterState.MiniClusterBenchState();
+    BenchmarkParams benchParams =
         new BenchmarkParams(
             "benchmark",
             "generatedTarget",
@@ -77,7 +80,7 @@ public void testMiniClusterState() throws Exception {
             "vmVersion",
             "jmhVersion",
             TimeValue.seconds(10));
-    baseBenchState = new BaseBenchState();
+    BaseBenchState baseBenchState = new BaseBenchState();
     baseBenchState.doSetup(benchParams);
     miniBenchState.doSetup(benchParams, baseBenchState);
 
@@ -108,7 +111,7 @@ public void testMiniClusterState() throws Exception {
             .field(doubles().all());
 
     int numDocs = 50;
-    docs.preGenerate(numDocs);
+    Iterator<SolrInputDocument> docIt = docs.preGenerate(numDocs);
 
     miniBenchState.index(collection, docs, numDocs);
 
@@ -121,12 +124,8 @@ public void testMiniClusterState() throws Exception {
     BaseBenchState.log("match all query result=" + result);
 
     assertEquals(numDocs, result.getResults().getNumFound());
-  }
 
-  @After
-  public void after() throws Exception {
     BaseBenchState.doTearDown(benchParams);
-
     miniBenchState.tearDown(benchParams);
     miniBenchState.shutdownMiniCluster(benchParams, baseBenchState);
   }

solr/core/build.gradle

@@ -122,7 +122,6 @@ dependencies {
   implementation 'org.eclipse.jetty:jetty-client'
   implementation 'org.eclipse.jetty:jetty-http'
   implementation 'org.eclipse.jetty:jetty-io'
-  implementation 'org.eclipse.jetty:jetty-util'
   implementation 'org.eclipse.jetty.toolchain:jetty-servlet-api'
 
   // ZooKeeper

solr/core/src/java/org/apache/solr/api/V2HttpCall.java

@@ -349,7 +349,7 @@ private boolean invokeJerseyRequest(
   }
 
   /**
-   * Differentiate between "admin" and "remoteproxy"-type requests; executing each as appropriate.
+   * Differentiate between "admin" and "remotequery"-type requests; executing each as appropriate.
    *
    * <p>The JAX-RS framework used by {@link V2HttpCall} doesn't provide any easy way to check in
    * advance whether a Jersey application can handle an incoming request. This, in turn, makes it
@@ -360,7 +360,7 @@ private boolean invokeJerseyRequest(
    * <p>This method uses this strategy to differentiate between admin requests that don't require a
    * {@link SolrCore}, but whose path happen to contain a core/collection name (e.g.
    * ADDREPLICAPROP's path of
-   * /collections/collName/shards/shardName/replicas/replicaName/properties), and "REMOTEPROXY"
+   * /collections/collName/shards/shardName/replicas/replicaName/properties), and "REMOTEQUERY"
    * requests which do require a local SolrCore to process.
    */
   @Override

solr/core/src/java/org/apache/solr/servlet/CoreContainerProvider.java

@@ -49,6 +49,7 @@
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import javax.servlet.UnavailableException;
+import org.apache.http.client.HttpClient;
 import org.apache.lucene.store.MMapDirectory;
 import org.apache.lucene.util.VectorUtil;
 import org.apache.solr.client.api.util.SolrVersion;
@@ -83,6 +84,7 @@ public class CoreContainerProvider implements ServletContextListener {
   private final String metricTag = SolrMetricProducer.getUniqueMetricTag(this, null);
   private CoreContainer cores;
   private Properties extraProperties;
+  private HttpClient httpClient;
   private SolrMetricManager metricManager;
   private RateLimitManager rateLimitManager;
   private String registryName;
@@ -121,6 +123,14 @@ CoreContainer getCoreContainer() throws UnavailableException {
     return cores;
   }
 
+  /**
+   * @see SolrDispatchFilter#getHttpClient()
+   */
+  HttpClient getHttpClient() throws UnavailableException {
+    checkReady();
+    return httpClient;
+  }
+
   private void checkReady() throws UnavailableException {
     // TODO throw AlreadyClosedException instead?
     if (cores == null) {
@@ -166,6 +176,7 @@ private void close() {
       }
     } finally {
       if (cc != null) {
+        httpClient = null;
         cc.shutdown();
       }
     }
@@ -218,6 +229,7 @@ private void init(ServletContext servletContext) {
               });
 
       coresInit = createCoreContainer(computeSolrHome(servletContext), extraProperties);
+      this.httpClient = coresInit.getUpdateShardHandler().getDefaultHttpClient();
       setupJvmMetrics(coresInit, coresInit.getNodeConfig().getMetricsConfig());
 
       SolrZkClient zkClient = null;