You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by so...@apache.org on 2020/06/03 19:13:42 UTC
[lucene-solr] 13/47: SOLR-14504: ZkController LiveNodesListener has
NullPointerException in startup race.
This is an automated email from the ASF dual-hosted git repository.
sokolov pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit aec740dfefe5f21e5ed3f3abb902ef06050ea571
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu May 21 18:17:05 2020 +0200
SOLR-14504: ZkController LiveNodesListener has NullPointerException in startup race.
---
solr/CHANGES.txt | 3 +++
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 26e2cb3..4185e9b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -192,6 +192,9 @@ Bug Fixes
* SOLR-14477: Fix incorrect 'relatedness()' calculations in json.facet 'terms' when 'prefix' option is used
(hossman)
+* SOLR-14504: ZkController LiveNodesListener has NullPointerException in startup race.
+ (Colvin Cowie via ab)
+
Other Changes
---------------------
* SOLR-14197: SolrResourceLoader: marked many methods as deprecated, and in some cases rerouted exiting logic to avoid
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index ecbb781..2cd376c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1016,7 +1016,7 @@ public class ZkController implements Closeable {
log.warn("Unable to read autoscaling.json", e1);
}
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) {
String path = ZkStateReader.SOLR_AUTOSCALING_NODE_LOST_PATH + "/" + n;