diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8545fbc5280..ee32813cbf1 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -260,6 +260,8 @@ Bug Fixes * SOLR-13318: Fix ClassCastException in SolrJ JsonFaceting classes (Munendra S N via Jason Gerlowski) +* SOLR-13449: SolrClientNodeStateProvider always retries on requesting metrics from other nodes (Cao Manh Dat) + Improvements ---------------------- 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 f164484b038..a1f507cf52e 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) {