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 2019/05/07 09:26:03 UTC
[lucene-solr] branch branch_7x updated: SOLR-13449:
SolrClientNodeStateProvider always retries on requesting metrics from other
nodes
This is an automated email from the ASF dual-hosted git repository.
datcm pushed a commit to branch branch_7x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_7x by this push:
new 06b0c62 SOLR-13449: SolrClientNodeStateProvider always retries on requesting metrics from other nodes
06b0c62 is described below
commit 06b0c62453909878349b3aeaac6200b0869d6bd7
Author: Cao Manh Dat <da...@apache.org>
AuthorDate: Tue May 7 09:40:45 2019 +0100
SOLR-13449: SolrClientNodeStateProvider always retries on requesting metrics from other nodes
---
solr/CHANGES.txt | 2 ++
.../org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java | 2 ++
2 files changed, 4 insertions(+)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8efaf80..07ac36e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -65,6 +65,8 @@ Bug Fixes
* SOLR-12833: Avoid unnecessary memory cost when DistributedUpdateProcessor timed-out lock is not used. (ab)
+* SOLR-13449: SolrClientNodeStateProvider always retries on requesting metrics from other nodes (Cao Manh Dat)
+
================== 7.7.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
index f164484..a1f507c 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/SolrClientNodeStateProvider.java
@@ -199,6 +199,7 @@ public class SolrClientNodeStateProvider implements NodeStateProvider, MapWriter
while (cnt++ < 3) {
try {
rsp = ctx.invoke(solrNode, CommonParams.METRICS_PATH, params);
+ break;
} catch (SolrException | SolrServerException | IOException e) {
boolean hasCauseIOException = false;
Throwable cause = e;
@@ -305,6 +306,7 @@ public class SolrClientNodeStateProvider implements NodeStateProvider, MapWriter
while (cnt++ < retries) {
try {
rsp = snitchContext.invoke(solrNode, CommonParams.METRICS_PATH, params);
+ break;
} catch (SolrException | SolrServerException | IOException e) {
if (e instanceof SolrServerException) {