SOLR-13950: Fix getLeaderRetry swallowing interrupt in ZkStateReader (#1023)

Let InterruptedException bubble up
This commit is contained in:
Andy Vuong 2019-11-22 11:04:45 -08:00 committed by Tomas Fernandez Lobbe
parent bc758601cd
commit a25ecd7f30
2 changed files with 3 additions and 1 deletions

View File

@ -111,6 +111,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 ZkStateReaders getLeaderRetry method
Other Changes
---------------------

View File

@ -970,7 +970,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());