You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/04/12 09:15:34 UTC
[2/2] lucene-solr:master: SOLR-10473: Correct LBHttpSolrClient's
confusing SolrServerException message when timeAllowed is exceeded.
SOLR-10473: Correct LBHttpSolrClient's confusing SolrServerException message when timeAllowed is exceeded.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/23109b98
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/23109b98
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/23109b98
Branch: refs/heads/master
Commit: 23109b98629880321145d8c4413088549bab8de2
Parents: 3ba4e73
Author: Christine Poerschke <cp...@apache.org>
Authored: Tue Apr 11 11:14:34 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Apr 12 10:03:38 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ++
.../client/solrj/impl/LBHttpSolrClient.java | 30 ++++++++++++++------
2 files changed, 25 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23109b98/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 128e386..4627b2e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -188,6 +188,9 @@ Bug Fixes
* SOLR-10474: TestPointFields.testPointFieldReturn() depends on order of unsorted hits. (Steve Rowe)
+* SOLR-10473: Correct LBHttpSolrClient's confusing SolrServerException message when timeAllowed is exceeded.
+ (Christine Poerschke)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/23109b98/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
index b0f1a50..ed6ae7b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java
@@ -360,10 +360,11 @@ public class LBHttpSolrClient extends SolrClient {
boolean isNonRetryable = req.request instanceof IsUpdateRequest || ADMIN_PATHS.contains(req.request.getPath());
List<ServerWrapper> skipped = null;
+ boolean timeAllowedExceeded = false;
long timeAllowedNano = getTimeAllowedInNanos(req.getRequest());
long timeOutTime = System.nanoTime() + timeAllowedNano;
for (String serverStr : req.getServers()) {
- if(isTimeExceeded(timeAllowedNano, timeOutTime)) {
+ if (timeAllowedExceeded = isTimeExceeded(timeAllowedNano, timeOutTime)) {
break;
}
@@ -400,7 +401,7 @@ public class LBHttpSolrClient extends SolrClient {
// try the servers we previously skipped
if (skipped != null) {
for (ServerWrapper wrapper : skipped) {
- if(isTimeExceeded(timeAllowedNano, timeOutTime)) {
+ if (timeAllowedExceeded = isTimeExceeded(timeAllowedNano, timeOutTime)) {
break;
}
@@ -417,10 +418,16 @@ public class LBHttpSolrClient extends SolrClient {
}
+ final String solrServerExceptionMessage;
+ if (timeAllowedExceeded) {
+ solrServerExceptionMessage = "Time allowed to handle this request exceeded";
+ } else {
+ solrServerExceptionMessage = "No live SolrServers available to handle this request";
+ }
if (ex == null) {
- throw new SolrServerException("No live SolrServers available to handle this request");
+ throw new SolrServerException(solrServerExceptionMessage);
} else {
- throw new SolrServerException("No live SolrServers available to handle this request:" + zombieServers.keySet(), ex);
+ throw new SolrServerException(solrServerExceptionMessage+":" + zombieServers.keySet(), ex);
}
}
@@ -593,10 +600,11 @@ public class LBHttpSolrClient extends SolrClient {
int maxTries = serverList.length;
Map<String,ServerWrapper> justFailed = null;
+ boolean timeAllowedExceeded = false;
long timeAllowedNano = getTimeAllowedInNanos(request);
long timeOutTime = System.nanoTime() + timeAllowedNano;
for (int attempts=0; attempts<maxTries; attempts++) {
- if(isTimeExceeded(timeAllowedNano, timeOutTime)) {
+ if (timeAllowedExceeded = isTimeExceeded(timeAllowedNano, timeOutTime)) {
break;
}
@@ -624,7 +632,7 @@ public class LBHttpSolrClient extends SolrClient {
// try other standard servers that we didn't try just now
for (ServerWrapper wrapper : zombieServers.values()) {
- if(isTimeExceeded(timeAllowedNano, timeOutTime)) {
+ if (timeAllowedExceeded = isTimeExceeded(timeAllowedNano, timeOutTime)) {
break;
}
@@ -651,10 +659,16 @@ public class LBHttpSolrClient extends SolrClient {
}
+ final String solrServerExceptionMessage;
+ if (timeAllowedExceeded) {
+ solrServerExceptionMessage = "Time allowed to handle this request exceeded";
+ } else {
+ solrServerExceptionMessage = "No live SolrServers available to handle this request";
+ }
if (ex == null) {
- throw new SolrServerException("No live SolrServers available to handle this request");
+ throw new SolrServerException(solrServerExceptionMessage);
} else {
- throw new SolrServerException("No live SolrServers available to handle this request", ex);
+ throw new SolrServerException(solrServerExceptionMessage, ex);
}
}