Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17275: Revert SolrJ ZkClientClusterStateProvider SOLR-17153 (#2463)

aparnasuresh85f073dc86e1ab
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 02d1a40ac42..bd554d527f3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -132,6 +132,8 @@ Bug Fixes
* SOLR-17263: Fix 'Illegal character in query' exception in HttpJdkSolrClient (Andy Webb)
+* SOLR-17275: SolrJ ZkClientClusterStateProvider, revert SOLR-17153 for perf regression when aliases are used. (Aparna Suresh)
+
Dependency Upgrades
---------------------
(No changes)
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
index bc56881e86d..f9d202f5949 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/client/solrj/impl/ZkClientClusterStateProvider.java
@@ -144,21 +144,10 @@ public class ZkClientClusterStateProvider
@Override
public ClusterState.CollectionRef getState(String collection) {
ClusterState clusterState = getZkStateReader().getClusterState();
- if (clusterState == null) {
- return null;
- }
-
- ClusterState.CollectionRef collectionRef = clusterState.getCollectionRef(collection);
- if (collectionRef == null) {
- // force update collection
- try {
- getZkStateReader().forceUpdateCollection(collection);
- return getZkStateReader().getClusterState().getCollectionRef(collection);
- } catch (KeeperException | InterruptedException e) {
- return null;
- }
+ if (clusterState != null) {
+ return clusterState.getCollectionRef(collection);
} else {
- return collectionRef;
+ return null;
}
}