[lucene-solr] 03/03: @946 A little work towards enabling this test.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 442e3f681387bbe1f8e7b536fa0f5e638b7afb33
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Oct 7 10:43:28 2020 -0500

    @946 A little work towards enabling this test.
---
 settings.gradle                                                     | 3 +++
 .../java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java | 6 ++++++
 solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java   | 6 ++----
 .../src/test/org/apache/solr/filestore/TestDistribPackageStore.java | 6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 172718b..204c7b0 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -77,3 +77,6 @@ include "solr:docker:package"
 
 include "solr:benchmark"
 
+
+include "solr:benchmark"
+
diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
index 29c54ce..e0f1efa 100644
--- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
+++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
@@ -48,6 +48,7 @@ import org.apache.lucene.util.Constants;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.cloud.SocketProxy;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.cloud.ZkController;
 import org.apache.solr.common.ParWork;
 import org.apache.solr.common.SolrException;
@@ -840,6 +841,11 @@ public class JettySolrRunner implements Closeable {
             withHttpClient(getCoreContainer().getUpdateShardHandler().getTheSharedHttpClient()).build();
   }
 
+  public SolrClient newHttp1Client() {
+    return new HttpSolrClient.Builder(getBaseUrl()).
+        withHttpClient(getCoreContainer().getUpdateShardHandler().getDefaultHttpClient()).build();
+  }
+
   public SolrClient newClient(int connectionTimeoutMillis, int socketTimeoutMillis) {
     return new Http2SolrClient.Builder(getBaseUrl().toString())
         .connectionTimeout(connectionTimeoutMillis)
diff --git a/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java b/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java
index 539fd19..3e3653f 100644
--- a/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java
+++ b/solr/core/src/java/org/apache/solr/filestore/PackageStoreAPI.java
@@ -254,17 +254,15 @@ public class PackageStoreAPI {
       }
       String getFrom = req.getParams().get("getFrom");
       if (getFrom != null) {
-        // nocommit
-       // coreContainer.getUpdateShardHandler().getUpdateExecutor().submit(() -> {
+        ParWork.getRootSharedExecutor().submit(() -> {
           log.debug("Downloading file {}", pathCopy);
           try {
             packageStore.fetch(pathCopy, getFrom);
           } catch (Exception e) {
-            ParWork.propagateInterrupt(e);
             log.error("Failed to download file: {}", pathCopy, e);
           }
           log.info("downloaded file: {}", pathCopy);
-       // });
+        });
         return;
 
       }
diff --git a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
index 0e67474..08237c9 100644
--- a/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
+++ b/solr/core/src/test/org/apache/solr/filestore/TestDistribPackageStore.java
@@ -60,7 +60,7 @@ import static org.apache.solr.core.TestDynamicLoading.getFileContent;
 import static org.hamcrest.CoreMatchers.containsString;
 
 @LogLevel("org.apache.solr.filestore.PackageStoreAPI=DEBUG;org.apache.solr.filestore.DistribPackageStore=DEBUG")
-@Ignore // nocommit improve
+@Ignore // nocommit fix
 public class TestDistribPackageStore extends SolrCloudTestCase {
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
@@ -203,7 +203,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
     }
     @Override
     public NavigableObject call() throws Exception {
-      try (HttpSolrClient solrClient = (HttpSolrClient) jetty.newClient()) {
+      try (HttpSolrClient solrClient = (HttpSolrClient) jetty.newHttp1Client()) {
         return (NavigableObject) Utils.executeGET(solrClient.getHttpClient(), this.url, JAVABINCONSUMER);
       }
     }
@@ -258,7 +258,7 @@ public class TestDistribPackageStore extends SolrCloudTestCase {
 
   public static void uploadKey(byte[] bytes, String path, MiniSolrCloudCluster cluster) throws Exception {
     JettySolrRunner jetty = cluster.getRandomJetty(random());
-    try(HttpSolrClient client = (HttpSolrClient) jetty.newClient()) {
+    try(HttpSolrClient client = (HttpSolrClient) jetty.newHttp1Client()) {
       PackageUtils.uploadKey(bytes, path, Paths.get(jetty.getCoreContainer().getSolrHome()), client);
       Object resp = Utils.executeGET(client.getHttpClient(), jetty.getBaseURLV2().toString() + "/node/files" + path + "?sync=true", null);
       log.info("sync resp: "+jetty.getBaseURLV2().toString() + "/node/files" + path + "?sync=true"+" ,is: "+resp);