[lucene-solr] branch master updated: SOLR-14684: Skipping check time exceeded for the first request in a proper way

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

datcm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new a4a0d9e  SOLR-14684: Skipping check time exceeded for the first request in a proper way
a4a0d9e is described below

commit a4a0d9e8ce6b48da00ca54cb1fcc0210735aca9b
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Mon Aug 24 10:11:13 2020 +0700

    SOLR-14684: Skipping check time exceeded for the first request in a proper way
---
 solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
index 1f40e66..5488f66 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
@@ -214,7 +214,7 @@ public abstract class LBSolrClient extends SolrClient {
         suffix = ":" + zombieServers.keySet();
       }
       // Skipping check time exceeded for the first request
-      if (previousEx != null && isTimeExceeded(timeAllowedNano, timeOutTime)) {
+      if (numServersTried > 0 && isTimeExceeded(timeAllowedNano, timeOutTime)) {
         throw new SolrServerException("Time allowed to handle this request exceeded"+suffix, previousEx);
       }
       if (serverStr == null) {