Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17467: Finish migration to --user-managed mode (#2781)

Eric Pugh30b99d096256
diff --git a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
index 4ede96e9a70..788a9b86dfc 100644
--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java
@@ -537,7 +537,7 @@ public class RunExampleTool extends ToolBase {
// start the other nodes
for (int n = 1; n < numNodes; n++)
startSolr(
- new File(cloudDir, "node" + (n + 1) + "/solr"), false, cli, cloudPorts[n], zkHost, 30);
+ new File(cloudDir, "node" + (n + 1) + "/solr"), true, cli, cloudPorts[n], zkHost, 30);
}
String solrUrl = (String) nodeStatus.get("baseUrl");
diff --git a/solr/packaging/test/test_example_noprompt.bats b/solr/packaging/test/test_example_noprompt.bats
index 7d5817a8847..19329a8041a 100644
--- a/solr/packaging/test/test_example_noprompt.bats
+++ b/solr/packaging/test/test_example_noprompt.bats
@@ -28,8 +28,8 @@ teardown() {
solr stop --all >/dev/null 2>&1
}
-@test "SOLR-16755 test works with --no-prompt" {
+@test "start -e cloud works with --no-prompt" {
solr start -e cloud --no-prompt
- solr assert --started http://localhost:${SOLR_PORT} --timeout 10000
- solr assert --started http://localhost:${SOLR2_PORT} --timeout 10000
+ solr assert --started http://localhost:${SOLR_PORT} --cloud http://localhost:${SOLR_PORT} --timeout 10000
+ solr assert --started http://localhost:${SOLR2_PORT} --cloud http://localhost:${SOLR2_PORT} --timeout 10000
}