diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 9c7db9642b7..98bca375c24 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -183,6 +183,8 @@ Bug Fixes * SOLR-13941: Tests configure Jetty differently than when running via start.jar (janhoy, Uwe Schindler) +* SOLR-13950: Fix InterruptedException being swallowed in ZkStateReader’s getLeaderRetry method + Other Changes --------------------- diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java index 5dea5b0b360..7185f4e7c7d 100644 --- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java +++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java @@ -968,7 +968,7 @@ public class ZkStateReader implements SolrCloseable { } return false; }); - } catch (TimeoutException | InterruptedException e) { + } catch (TimeoutException e) { throw new SolrException(ErrorCode.SERVICE_UNAVAILABLE, "No registered leader was found after waiting for " + timeout + "ms " + ", collection: " + collection + " slice: " + shard + " saw state=" + clusterState.getCollectionOrNull(collection) + " with live_nodes=" + clusterState.getLiveNodes());