You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/11/13 21:32:31 UTC
[lucene-solr] branch reference_impl_dev updated: @1176 Make state
version a query param for dist updates.
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
The following commit(s) were added to refs/heads/reference_impl_dev by this push:
new a420c06 @1176 Make state version a query param for dist updates.
a420c06 is described below
commit a420c065dc7f58800d05905658f932e047ef508f
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Nov 13 15:30:13 2020 -0600
@1176 Make state version a query param for dist updates.
---
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index f5fea31..495ac91 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -328,7 +328,7 @@ public class HttpSolrCall {
ensureStatesAreAtLeastAtClient();
- invalidStates = checkStateVersionsAreValid(solrReq.getParams().get(CloudSolrClient.STATE_VERSION));
+ invalidStates = checkStateVersionsAreValid(queryParams.get(CloudSolrClient.STATE_VERSION));
addCollectionParamIfNeeded(getCollectionsList());
diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
index 9ade4fa..dab0947 100644
--- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
+++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java
@@ -27,6 +27,7 @@ import com.google.common.annotations.VisibleForTesting;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.solr.client.solrj.impl.BaseCloudSolrClient;
import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.common.ParWork;
@@ -116,6 +117,7 @@ public class UpdateShardHandler implements SolrInfoBean {
Set<String> queryParams = new HashSet<>(2);
queryParams.add(DistributedUpdateProcessor.DISTRIB_FROM);
queryParams.add(DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM);
+ queryParams.add(BaseCloudSolrClient.STATE_VERSION);
updateOnlyClient.setQueryParams(queryParams);