Apache Solr open-source search software
SOLR-15113 Do not attempt to start Solr server when embedded ZK fails (#2255)
Mike Drob9be71b39399a
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 7edd319a01a..901f293cb5d 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -191,6 +191,8 @@ Other Changes* SOLR-14297: Replace commons-codec Base64 with JDK8 Base64 (Andras Salamon via Houston Putman)+* SOLR-15113: Do not attempt to start Solr server when embedded ZK fails (Mike Drob)+Bug Fixes---------------------* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order executiondiff --git a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.javaindex 8ee9c0ef4ec..62d3248afd0 100644--- a/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java+++ b/solr/core/src/java/org/apache/solr/cloud/SolrZkServer.java@@ -36,6 +36,7 @@ import java.net.UnknownHostException;import java.nio.charset.StandardCharsets;import java.util.Map;import java.util.Properties;+import java.util.concurrent.atomic.AtomicReference;import java.util.regex.Pattern;@@ -107,26 +108,24 @@ public class SolrZkServer {if (System.getProperty(ZK_WHITELIST_PROPERTY) == null) {System.setProperty(ZK_WHITELIST_PROPERTY, "ruok, mntr, conf");}- zkThread = new Thread() {- @Override- public void run() {- try {- if (zkProps.getServers().size() > 1) {- QuorumPeerMain zkServer = new QuorumPeerMain();- zkServer.runFromConfig(zkProps);- } else {- ServerConfig sc = new ServerConfig();- sc.readFrom(zkProps);- ZooKeeperServerMain zkServer = new ZooKeeperServerMain();- zkServer.runFromConfig(sc);- }- log.info("ZooKeeper Server exited.");- } catch (Exception e) {- log.error("ZooKeeper Server ERROR", e);- throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);+ AtomicReference<Exception> zkException = new AtomicReference<>();+ zkThread = new Thread(() -> {+ try {+ if (zkProps.getServers().size() > 1) {+ QuorumPeerMain zkServer = new QuorumPeerMain();+ zkServer.runFromConfig(zkProps);+ } else {+ ServerConfig sc = new ServerConfig();+ sc.readFrom(zkProps);+ ZooKeeperServerMain zkServer = new ZooKeeperServerMain();+ zkServer.runFromConfig(sc);}+ log.info("ZooKeeper Server exited.");+ } catch (Exception e) {+ log.error("ZooKeeper Server ERROR", e);+ zkException.set(e);}- };+ }, "embeddedZkServer");if (zkProps.getServers().size() > 1) {if (log.isInfoEnabled()) {@@ -143,9 +142,16 @@ public class SolrZkServer {zkThread.setDaemon(true);zkThread.start();try {+ // We don't have any way to hook into the ZK server object to check that it is running, so we just wait and hopeThread.sleep(500); // pause for ZooKeeper to start- } catch (Exception e) {- log.error("STARTING ZOOKEEPER", e);+ } catch (InterruptedException e) {+ Thread.currentThread().interrupt();+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Interrupted while starting embedded zookeeper server", e);+ }++ if (zkException.get() != null) {+ log.info("Embedded ZK dataHome={}", dataHome);+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Could not start embedded zookeeper server", zkException.get());}}diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.javaindex cc0e5089c5b..1bd16cfafc3 100644--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java@@ -230,9 +230,13 @@ public class ConnectionManager implements Watcher {}}+ /**+ * Wait for an established zookeeper connection+ * @param waitForConnection time to wait, in ms+ */public synchronized void waitForConnected(long waitForConnection)throws TimeoutException {- log.info("Waiting for client to connect to ZooKeeper");+ log.info("Waiting up to {}ms for client to connect to ZooKeeper", waitForConnection);long expire = System.nanoTime() + TimeUnit.NANOSECONDS.convert(waitForConnection, TimeUnit.MILLISECONDS);long left = 1;while (!connected && left > 0) {