Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16850: Notify a user if they run Healthcheck againsts a standalone mode Solr (#1804)

Eric Pugh34b3aefe58d9
diff --git a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
index 09ba0eaefb5..a657eca84bb 100644
--- a/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/HealthcheckTool.java
@@ -89,6 +89,10 @@ public class HealthcheckTool extends ToolBase {
public void runImpl(CommandLine cli) throws Exception {
SolrCLI.raiseLogLevelUnlessVerbose(cli);
String zkHost = SolrCLI.getZkHost(cli);
+ if (zkHost == null) {
+ CLIO.err("Healthcheck tool only works in Solr Cloud mode.");
+ System.exit(1);
+ }
try (CloudHttp2SolrClient cloudSolrClient =
new CloudHttp2SolrClient.Builder(Collections.singletonList(zkHost), Optional.empty())
.build()) {
diff --git a/solr/packaging/test/test_healthcheck.bats b/solr/packaging/test/test_healthcheck.bats
index 73c41405653..98a97c5b9e9 100644
--- a/solr/packaging/test/test_healthcheck.bats
+++ b/solr/packaging/test/test_healthcheck.bats
@@ -34,3 +34,10 @@ teardown() {
refute_output --partial 'error'
}
+
+@test "healthcheck errors on standalone solr" {
+ solr start -e films
+ run solr healthcheck -c films
+ assert_output --partial 'Healthcheck tool only works in Solr Cloud mode'
+
+}