You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2020/08/28 04:01:51 UTC
[lucene-solr] branch branch_8x updated (5454d76 -> 5f0c9df)
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a change to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 5454d76 Adding forceMergeDeletePctAllowed and deletesPctAllowed to TieredMergePolicy documentation
new a93cb71 SOLR-14684: CloudExitableDirectoryReaderTest failing about 25% of the time (#1724)
new 5f0c9df SOLR-14684: Skipping check time exceeded for the first request in a proper way
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[lucene-solr] 01/02: SOLR-14684: CloudExitableDirectoryReaderTest
failing about 25% of the time (#1724)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit a93cb7102f02b25e50dfac2353e9c4c2a445b177
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Fri Aug 21 15:41:04 2020 +0700
SOLR-14684: CloudExitableDirectoryReaderTest failing about 25% of the time (#1724)
---
.../solrj/src/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 a97a1c8..5d091c4 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) {
[lucene-solr] 02/02: SOLR-14684: Skipping check time exceeded for
the first request in a proper way
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 5f0c9dfbabd99f470823241437b20ada05ee79d7
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 5d091c4..e9dd998 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) {