Apache Solr open-source search software
SOLR-17145: Add 'requestid' to INSTALLSHARD response (#2252)
Jason Gerlowskice3d8585ac09
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 8dbdc598a9c..1f7412baea4 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -95,6 +95,8 @@ Improvements* SOLR-16858: KnnQParser's "Pre-Filtering" behavior is now controlable via local params (hossman)+* SOLR-17145: The INSTALLSHARDDATA API now includes a 'requestid' field when run asynchronously (Jason Gerlowski)+Optimizations---------------------* SOLR-17144: Close searcherExecutor thread per core after 1 minute (Pierre Salagnac, Christine Poerschke)diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.javaindex f1f88f78e54..ac13ef75908 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/InstallShardData.java@@ -23,8 +23,8 @@ import static org.apache.solr.security.PermissionNameProvider.Name.COLL_EDIT_PERimport jakarta.inject.Inject;import java.util.HashMap;import org.apache.solr.client.api.endpoint.InstallShardDataApi;+import org.apache.solr.client.api.model.AsyncJerseyResponse;import org.apache.solr.client.api.model.InstallShardDataRequestBody;-import org.apache.solr.client.api.model.SolrJerseyResponse;import org.apache.solr.client.solrj.SolrResponse;import org.apache.solr.cloud.api.collections.InstallShardDataCmd;import org.apache.solr.common.SolrException;@@ -59,9 +59,9 @@ public class InstallShardData extends AdminAPIBase implements InstallShardDataAp@Override@PermissionName(COLL_EDIT_PERM)- public SolrJerseyResponse installShardData(+ public AsyncJerseyResponse installShardData(String collName, String shardName, InstallShardDataRequestBody requestBody) throws Exception {- final SolrJerseyResponse response = instantiateJerseyResponse(SolrJerseyResponse.class);+ final var response = instantiateJerseyResponse(AsyncJerseyResponse.class);final CoreContainer coreContainer = fetchAndValidateZooKeeperAwareCoreContainer();recordCollectionForLogAndTracing(collName, solrQueryRequest);if (requestBody == null) {@@ -99,6 +99,11 @@ public class InstallShardData extends AdminAPIBase implements InstallShardDataApthrow remoteResponse.getException();}+ if (requestBody.async != null) {+ response.requestId = requestBody.async;+ return response;+ }+return response;}