Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Revert "queries to missing collection are slow"

Noble Paulae8b507f0b48
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 8617c0dde4b..debd481a9a3 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -469,10 +469,6 @@ public class HttpSolrCall {
} else {
if (!retry) {
// we couldn't find a core to work with, try reloading aliases & this collection
- if (!cores.getZkController().getZkStateReader().aliasesManager.update()) {
- // no change. go back
- return;
- }
cores.getZkController().getZkStateReader().aliasesManager.update();
cores.getZkController().zkStateReader.forceUpdateCollection(collectionName);
action = RETRY;
diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 9011f750876..7e2c626431c 100644
--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -2289,17 +2289,10 @@ public class ZkStateReader implements SolrCloseable {
* @return true if an update was performed
*/
public boolean update() throws KeeperException, InterruptedException {
- if (log.isDebugEnabled()) {
- log.debug("Checking ZK for most up to date Aliases {}", ALIASES);
- }
- Stat stat = zkClient.getZooKeeper().exists(ALIASES, null);
- if (stat == null || stat.getVersion() <= aliases.getZNodeVersion()) {
- return false;
- } else {
- stat = new Stat();
- }
+ log.debug("Checking ZK for most up to date Aliases {}", ALIASES);
// Call sync() first to ensure the subsequent read (getData) is up to date.
zkClient.getZooKeeper().sync(ALIASES, null, null);
+ Stat stat = new Stat();
final byte[] data = zkClient.getData(ALIASES, null, stat, true);
return setIfNewer(Aliases.fromJSON(data, stat.getVersion()));
}