From 2b2b9e71d3defe6aa4578f9a571078de8b88c7c6 Mon Sep 17 00:00:00 2001
From: Cao Manh Dat <datcm@apache.org>
Date: Fri, 21 Aug 2020 15:41:04 +0700
Subject: [PATCH] SOLR-14684: CloudExitableDirectoryReaderTest failing about
 25% of the time (#1724)

---
 .../java/org/apache/solr/client/solrj/impl/LBSolrClient.java   | 3 ++-
 1 file changed, 2 insertions(+), 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 c1e6af79623..1f40e661bbb 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
@@ -213,7 +213,8 @@ public abstract class LBSolrClient extends SolrClient {
       if (previousEx == null) {
         suffix = ":" + zombieServers.keySet();
       }
-      if (isTimeExceeded(timeAllowedNano, timeOutTime)) {
+      // Skipping check time exceeded for the first request
+      if (previousEx != null && isTimeExceeded(timeAllowedNano, timeOutTime)) {
         throw new SolrServerException("Time allowed to handle this request exceeded"+suffix, previousEx);
       }
       if (serverStr == null) {