Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-14504: ZkController LiveNodesListener has NullPointerException in startup race.

This commit is contained in:
Andrzej Bialecki 2020-05-21 18:17:05 +02:00
parent 9c066f60f1
commit 0728ef06e9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -192,6 +192,9 @@ Bug Fixes
* SOLR-14477: Fix incorrect 'relatedness()' calculations in json.facet 'terms' when 'prefix' option is used * SOLR-14477: Fix incorrect 'relatedness()' calculations in json.facet 'terms' when 'prefix' option is used
(hossman) (hossman)
* SOLR-14504: ZkController LiveNodesListener has NullPointerException in startup race.
(Colvin Cowie via ab)
Other Changes Other Changes
--------------------- ---------------------
* SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid * SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid

2
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -1016,7 +1016,7 @@ public class ZkController implements Closeable {
log.warn("Unable to read autoscaling.json", e1); log.warn("Unable to read autoscaling.json", e1);
} }
if (createNodes) { if (createNodes) {
byte[] json = Utils.toJSON(Collections.singletonMap("timestamp", cloudManager.getTimeSource().getEpochTimeNs())); byte[] json = Utils.toJSON(Collections.singletonMap("timestamp", getSolrCloudManager().getTimeSource().getEpochTimeNs()));
for (String n : oldNodes) { for (String n : oldNodes) {
String path = ZkStateReader.SOLR_AUTOSCALING_NODE_LOST_PATH + "/" + n; String path = ZkStateReader.SOLR_AUTOSCALING_NODE_LOST_PATH + "/" + n;