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 2016/08/19 11:38:10 UTC
lucene-solr:branch_6x: SOLR-9391: LBHttpSolrClient.request now
correctly returns Rsp.server when previously skipped servers were
successfully tried.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 292644f9a -> 9a5dcce5d
SOLR-9391: LBHttpSolrClient.request now correctly returns Rsp.server when previously skipped servers were successfully tried.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9a5dcce5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9a5dcce5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9a5dcce5
Branch: refs/heads/branch_6x
Commit: 9a5dcce5de61be427adce43e4d03642484a78a5a
Parents: 292644f
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Aug 19 10:01:45 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Aug 19 11:18:40 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9a5dcce5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 58ae00a..964807a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -183,6 +183,9 @@ Bug Fixes
* SOLR-9032: Admin UI now correctly implements Create Alias command (Upayavira, Alexandre Rafalovitch)
+* SOLR-9391: LBHttpSolrClient.request now correctly returns Rsp.server when
+ previously skipped servers were successfully tried. (Christine Poerschke)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9a5dcce5/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 55b0a8a..9b7d3fe 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
@@ -348,7 +348,6 @@ public class LBHttpSolrClient extends SolrClient {
}
continue;
}
- rsp.server = serverStr;
try {
MDC.put("LBHttpSolrClient.url", serverStr);
HttpSolrClient client = makeSolrClient(serverStr);
@@ -400,6 +399,7 @@ public class LBHttpSolrClient extends SolrClient {
boolean isZombie, String zombieKey) throws SolrServerException, IOException {
Exception ex = null;
try {
+ rsp.server = client.getBaseURL();
rsp.rsp = client.request(req.getRequest(), (String) null);
if (isZombie) {
zombieServers.remove(zombieKey);