[lucene-solr] 02/08: @1318 Allow small core wait for zkAware if external request.

[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 eb606eb1ba68c6516143a9b89e64ffb57a07b18a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Feb 3 00:17:36 2021 -0600

    @1318 Allow small core wait for zkAware if external request.
---
 solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 826a4f4..0a097f8 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -261,8 +261,8 @@ public class HttpSolrCall {
 
       core = cores.getCore(origCorename);
 
-      if (core == null && !cores.isZooKeeperAware() && cores.isCoreLoading(origCorename)) {
-        cores.waitForLoadingCore(origCorename, 3000);
+      if (core == null && (!cores.isZooKeeperAware() ||  QoSParams.INTERNAL.equals(req.getHeader(QoSParams.REQUEST_SOURCE))) && cores.isCoreLoading(origCorename)) {
+        cores.waitForLoadingCore(origCorename, 2500);
       }
 
       if (log.isDebugEnabled()) log.debug("tried to get core by name {} got {}, existing cores {} found={}", origCorename, core, cores.getAllCoreNames(), core != null);