Apache Solr open-source search software
SOLR-15849 Incorrect use Zookeeper 4LW (#458)
Fa Ming48ffa68aecc9
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex a06b1b88fff..36cbe7ae88a 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -420,6 +420,8 @@ Other ChangesBug Fixes---------------------+* SOLR-15849: Fix the connection reset problem caused by the incorrect use of 4LW with \n when monitoring zooKeeper status (Fa Ming).+* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor that could lead to out of order executionof Collection API tasks competing for a lock (Ilan Ginzburg).diff --git a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.javaindex 5bf77709236..26f6a62dda1 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/ZookeeperStatusHandler.java@@ -297,7 +297,8 @@ public class ZookeeperStatusHandler extends RequestHandlerBase {Writer writer = new OutputStreamWriter(socket.getOutputStream(), StandardCharsets.UTF_8);PrintWriter out = new PrintWriter(writer, true);BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream(), StandardCharsets.UTF_8))) {- out.println(fourLetterWordCommand);+ out.print(fourLetterWordCommand);+ out.flush();List<String> response = in.lines().collect(Collectors.toList());log.debug("Got response from ZK on host {} and port {}: {}", host, port, response);return response;