Apache Solr open-source search software
SOLR-17467: Start solr in Cloud mode, introduce --user-managed switch for User Managed mode (#2729)
Eric Pugh09280bbf910f
diff --git a/dev-docs/running-in-docker.adoc b/dev-docs/running-in-docker.adocindex 202d0379b1e..e1e96dac244 100644--- a/dev-docs/running-in-docker.adoc+++ b/dev-docs/running-in-docker.adoc@@ -8,7 +8,7 @@ To run Solr in a container and expose the Solr port, run:In order to start Solr in cloud mode, run the following.-`docker run -p 8983:8983 solr solr-fg -c`+`docker run -p 8983:8983 solr solr-fg`For documentation on using the official docker builds, please refer to the https://hub.docker.com/_/solr[DockerHub page].Up-to-date documentation for running locally built images of this branch can be found in the xref:_running_solr_in_docker[local reference guide].@@ -30,4 +30,4 @@ For more info on building an image, run:`./gradlew helpDocker`== Additional Information-You can find additional information in the https://solr.apache.org/guide/solr/latest/deployment-guide/solr-in-docker.html[Solr Ref Guide Docker Page]\ No newline at end of file+You can find additional information in the https://solr.apache.org/guide/solr/latest/deployment-guide/solr-in-docker.html[Solr Ref Guide Docker Page]diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 6a1ccd83448..1032406f538 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -10,6 +10,8 @@ New Features---------------------* SOLR-14496: Solr CLI commands now can interact with a Solr secured using Basic Authentication. (Eric Pugh)+* SOLR-17467: Solr CLI bin/solr start defaults to starting Solr in Cloud mode, use --user-managed switch for User Managed (aka Standalone) mode. (Eric Pugh)+Improvements---------------------diff --git a/solr/bin/solr b/solr/bin/solrindex 4ab26565e92..8a993233a0a 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -367,14 +367,13 @@ function print_usage() {if [[ "$CMD" == "start" || "$CMD" == "restart" ]]; thenecho ""- echo "Usage: solr $CMD [-f] [-c] [--host host] [-p port] [--server-dir directory] [-z zkHost] [-m memory] [-e example] [--solr-home solr.solr.home] [--data-home solr.data.home] [--jvm-opts \"jvm-opts\"] [-V]"+ echo "Usage: solr $CMD [-f] [--user-managed] [--host host] [-p port] [--server-dir directory] [-z zkHost] [-m memory] [-e example] [--solr-home solr.solr.home] [--data-home solr.data.home] [--jvm-opts \"jvm-opts\"] [--verbose]"echo ""echo " -f Start Solr in foreground; default starts Solr in the background"echo " and sends stdout / stderr to solr-PORT-console.log"echo ""- echo " -c or --cloud Start Solr in SolrCloud mode; if -z not supplied and ZK_HOST not defined in"- echo " solr.in.sh, an embedded ZooKeeper instance is started on Solr port+1000,"- echo " such as 9983 if Solr is bound to 8983"+ echo " --user-managed Start Solr in user managed aka standalone mode"+ echo " See the Ref Guide for more details: https://solr.apache.org/guide/solr/latest/deployment-guide/cluster-types.html"echo ""echo " --host <host> Specify the hostname for this Solr instance"echo ""@@ -385,7 +384,7 @@ function print_usage() {echo ""echo " --server-dir <dir> Specify the Solr server directory; defaults to server"echo ""- echo " -z/--zk-host <zkHost> Zookeeper connection string; only used when running in SolrCloud mode using -c"+ echo " -z/--zk-host <zkHost> Zookeeper connection string; ignored when running in User Managed (--user-managed) mode."echo " If neither ZK_HOST is defined in solr.in.sh nor the -z parameter is specified,"echo " an embedded ZooKeeper instance will be launched."echo " Set the ZK_CREATE_CHROOT environment variable to true if your ZK host has a chroot path, and you want to create it automatically."@@ -733,13 +732,14 @@ FORCE=falseSOLR_OPTS=(${SOLR_OPTS:-})SCRIPT_SOLR_OPTS=()PASS_TO_RUN_EXAMPLE=()+SOLR_MODE="solrcloud"if [ $# -gt 0 ]; thenwhile true; docase "${1:-}" in- -c|--cloud|-cloud)- SOLR_MODE="solrcloud"- PASS_TO_RUN_EXAMPLE+=("-c")+ --user-managed)+ SOLR_MODE="user-managed"+ PASS_TO_RUN_EXAMPLE+=("--user-managed")shift;;-d|--dir|-dir|--server-dir)@@ -821,7 +821,6 @@ if [ $# -gt 0 ]; thenexit 1fiZK_HOST="$2"- SOLR_MODE="solrcloud"PASS_TO_RUN_EXAMPLE+=("-z" "$ZK_HOST")shift 2;;@@ -1141,11 +1140,6 @@ if [ "${#GC_LOG_OPTS[@]}" -gt 0 ]; thenfifi-# If ZK_HOST is defined, the assume SolrCloud mode-if [[ -n "${ZK_HOST:-}" ]]; then- SOLR_MODE="solrcloud"-fi-if [ "${SOLR_MODE:-}" == 'solrcloud' ]; then: "${ZK_CLIENT_TIMEOUT:=30000}"CLOUD_MODE_OPTS=("-DzkClientTimeout=$ZK_CLIENT_TIMEOUT")diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex 84c578a10ee..f4f3d927fc0 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -307,14 +307,13 @@ goto done:start_usage@echo.-@echo Usage: solr %SCRIPT_CMD% [-f] [-c] [--host hostname] [-p port] [--server-dir directory] [-z zkHost] [-m memory] [-e example] [--solr-home solr.solr.home] [--data-home solr.data.home] [--jvm-opts "jvm-opts"] [-V]+@echo Usage: solr %SCRIPT_CMD% [-f] [--user-managed] [--host hostname] [-p port] [--server-dir directory] [-z zkHost] [-m memory] [-e example] [--solr-home solr.solr.home] [--data-home solr.data.home] [--jvm-opts "jvm-opts"] [--verbose]@echo.@echo -f Start Solr in foreground; default starts Solr in the background@echo and sends stdout / stderr to solr-PORT-console.log@echo.-@echo -c or --cloud Start Solr in SolrCloud mode; if -z not supplied and ZK_HOST not defined in-@echo solr.in.cmd, an embedded ZooKeeper instance is started on Solr port+1000,-@echo such as 9983 if Solr is bound to 8983+@echo --user-managed Start Solr in user managed aka standalone mode"+@echo See the Ref Guide for more details: https://solr.apache.org/guide/solr/latest/deployment-guide/cluster-types.html@echo.@echo --host host Specify the hostname for this Solr instance@echo.@@ -401,9 +400,7 @@ IF "%1"=="--verbose" goto set_verboseIF "%1"=="-v" goto set_verboseIF "%1"=="-q" goto set_warnIF "%1"=="--quiet" goto set_warn-IF "%1"=="-c" goto set_cloud_mode-IF "%1"=="-cloud" goto set_cloud_mode-IF "%1"=="--cloud" goto set_cloud_mode+IF "%1"=="--user-managed" goto set_user_managed_modeIF "%1"=="-d" goto set_server_dirIF "%1"=="--dir" goto set_server_dirIF "%1"=="--server-dir" goto set_server_dir@@ -462,8 +459,8 @@ set SOLR_LOG_LEVEL=WARNSHIFTgoto parse_args-:set_cloud_mode-set SOLR_MODE=solrcloud+:set_user_managed_mode+set SOLR_MODE=user-managedSHIFTgoto parse_args@@ -875,7 +872,7 @@ IF "%SCRIPT_CMD%"=="start" ()))-+IF "%EMPTY_ADDL_JVM_ARGS%"=="true" (set "SCRIPT_ERROR=JVM options are required when using the -a or --jvm-opts option!"goto err@@ -907,6 +904,7 @@ if !JAVA_MAJOR_VERSION! LSS 9 ()IF NOT "%ZK_HOST%"=="" set SOLR_MODE=solrcloud+IF NOT "%SOLR_MODE%"=="" set SOLR_MODE=solrcloudIF "%SOLR_MODE%"=="solrcloud" (IF "%ZK_CLIENT_TIMEOUT%"=="" set "ZK_CLIENT_TIMEOUT=30000"@@ -942,7 +940,8 @@ IF "%SOLR_MODE%"=="solrcloud" (IF EXIST "%SOLR_HOME%\collection1\core.properties" set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -Dbootstrap_confdir=./solr/collection1/conf -Dcollection.configName=myconf -DnumShards=1") ELSE (- set CLOUD_MODE_OPTS=+ REM change Cloud mode to User Managed mode with flag+ set "CLOUD_MODE_OPTS=--user-managed"IF NOT EXIST "%SOLR_HOME%\solr.xml" (IF "%SOLR_SOLRXML_REQUIRED%"=="true" (set "SCRIPT_ERROR=Solr home directory %SOLR_HOME% must contain solr.xml!"diff --git a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.javaindex a4dfc37d9d5..3c82cc53feb 100644--- a/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java+++ b/solr/core/src/java/org/apache/solr/cli/RunExampleTool.java@@ -167,11 +167,10 @@ public class RunExampleTool extends ToolBase {.required(false).desc("Specify the hostname for this Solr instance.").build(),- Option.builder("c")- .longOpt("cloud")+ Option.builder()+ .longOpt("user-managed").required(false)- .desc(- "Start Solr in SolrCloud mode; if -z not supplied, an embedded ZooKeeper instance is started on Solr port+1000, such as 9983 if Solr is bound to 8983.")+ .desc("Start Solr in User Managed mode.").build(),Option.builder("m").longOpt("memory")@@ -263,7 +262,7 @@ public class RunExampleTool extends ToolBase {String configSet ="techproducts".equals(exampleName) ? "sample_techproducts_configs" : "_default";- boolean isCloudMode = cli.hasOption('c');+ boolean isCloudMode = !cli.hasOption("user-managed");String zkHost = cli.getOptionValue('z');int port =Integer.parseInt(@@ -536,7 +535,7 @@ public class RunExampleTool extends ToolBase {// start the other nodesfor (int n = 1; n < numNodes; n++)startSolr(- new File(cloudDir, "node" + (n + 1) + "/solr"), true, cli, cloudPorts[n], zkHost, 30);+ new File(cloudDir, "node" + (n + 1) + "/solr"), false, cli, cloudPorts[n], zkHost, 30);}String solrUrl = (String) nodeStatus.get("baseUrl");@@ -612,9 +611,9 @@ public class RunExampleTool extends ToolBase {String hostArg = (host != null && !"localhost".equals(host)) ? " --host " + host : "";String zkHostArg = (zkHost != null) ? " -z " + zkHost : "";String memArg = (memory != null) ? " -m " + memory : "";- String cloudModeArg = cloudMode ? "--cloud " : "";+ String cloudModeArg = cloudMode ? "" : "--user-managed";String forceArg = cli.hasOption("force") ? " --force" : "";- String verboseArg = verbose ? "-V" : "";+ String verboseArg = verbose ? "--verbose" : "";String jvmOpts =cli.hasOption("jvm-opts") ? cli.getOptionValue("jvm-opts") : cli.getOptionValue('a');diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.javaindex bfe8e66179b..eac28a424e2 100755--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java@@ -676,7 +676,7 @@ public class SolrCLI implements CLIO {" SolrCloud example (start Solr running in SolrCloud mode using localhost:2181 to connect to Zookeeper, with 1g max heap size and remote Java debug options enabled):");print("");printGreen(- " ./solr start -c -m 1g -z localhost:2181 --jvm-opts \"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044\"");+ " ./solr start -m 1g -z localhost:2181 --jvm-opts \"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044\"");print("");print(" Omit '-z localhost:2181' from the above command if you have defined ZK_HOST in solr.in.sh.");diff --git a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.javaindex d57d2fdd51b..6c0522fd937 100644--- a/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java+++ b/solr/core/src/test/org/apache/solr/cli/TestSolrCLIRunExample.java@@ -115,7 +115,7 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {if (exe.endsWith("solr")) {String[] args = cmd.getArguments();if ("start".equals(args[0])) {- if (!hasFlag("--cloud", args) && !hasFlag("-c", args)) {+ if (hasFlag("--user-managed", args)) {return startStandaloneSolr(args);}@@ -336,9 +336,12 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {}protected void testExample(String exampleName) throws Exception {+ // Occasionally we want to test in User Managed mode, not the default SolrCloud mode.+ String testStandaloneMode = LuceneTestCase.rarely() ? "--user-managed" : "";File solrHomeDir = new File(ExternalPaths.SERVER_HOME);- if (!solrHomeDir.isDirectory())+ if (!solrHomeDir.isDirectory()) {fail(solrHomeDir.getAbsolutePath() + " not found and is required to run this test!");+ }Path tmpDir = createTempDir();File solrExampleDir = tmpDir.toFile();@@ -355,10 +358,15 @@ public class TestSolrCLIRunExample extends SolrTestCaseJ4 {String[] toolArgs =new String[] {- "-e", exampleName,- "--server-dir", solrServerDir.getAbsolutePath(),- "--example-dir", solrExampleDir.getAbsolutePath(),- "-p", String.valueOf(bindPort)+ "-e",+ exampleName,+ "--server-dir",+ solrServerDir.getAbsolutePath(),+ "--example-dir",+ solrExampleDir.getAbsolutePath(),+ "-p",+ String.valueOf(bindPort),+ testStandaloneMode};// capture tool output to stdoutdiff --git a/solr/docker/gradle-help.txt b/solr/docker/gradle-help.txtindex bd53b6a864d..63d5089259b 100644--- a/solr/docker/gradle-help.txt+++ b/solr/docker/gradle-help.txt@@ -78,11 +78,11 @@ Each input tasks a comma separated list of test names.Run specific tests:EnvVar: SOLR_DOCKER_TESTS_INCLUDE- Gradle Property: -Psolr.docker.tests.include+ Gradle Property: -Psolr.docker.tests.include=cloud_multi_node_embedded_zk,demoExclude specific tests:EnvVar: SOLR_DOCKER_TESTS_EXCLUDE- Gradle Property: -Psolr.docker.tests.exclude+ Gradle Property: -Psolr.docker.tests.exclude=cloud_multi_node_embedded_zk,demoThe docker tests can also be run concurrently, if explicitly specified.The parallelization is set by the number of gradle workers you have defined, this cannot be specified separately.diff --git a/solr/docker/scripts/solr-create b/solr/docker/scripts/solr-createindex 41f71500942..5868353ee21 100755--- a/solr/docker/scripts/solr-create+++ b/solr/docker/scripts/solr-create@@ -75,4 +75,4 @@ elsefifi-exec solr-fg+exec solr-fg --user-manageddiff --git a/solr/docker/scripts/solr-demo b/solr/docker/scripts/solr-demoindex 29e5b0625de..2db2828f3fc 100755--- a/solr/docker/scripts/solr-demo+++ b/solr/docker/scripts/solr-demo@@ -50,4 +50,4 @@ elsefifi-exec solr-fg+exec solr-fg --user-manageddiff --git a/solr/docker/scripts/solr-precreate b/solr/docker/scripts/solr-precreateindex 96277e1d409..7f6c10dd6b1 100755--- a/solr/docker/scripts/solr-precreate+++ b/solr/docker/scripts/solr-precreate@@ -36,4 +36,4 @@ source run-initdbprecreate-core "$@"-exec solr-fg+exec solr-fg --user-manageddiff --git a/solr/docker/scripts/start-local-solr b/solr/docker/scripts/start-local-solrindex 633fca3d686..03284b824f5 100755--- a/solr/docker/scripts/start-local-solr+++ b/solr/docker/scripts/start-local-solr@@ -23,7 +23,7 @@ if [[ "${VERBOSE:-}" == "yes" ]]; thenfiecho "Running solr in the background. Logs are in /var/solr/logs"-SOLR_OPTS="-Djetty.host=${SOLR_LOCAL_HOST:-localhost}" solr start+SOLR_OPTS="-Djetty.host=${SOLR_LOCAL_HOST:-localhost}" solr start --user-managedmax_try=${MAX_TRY:-12}wait_seconds=${WAIT_SECONDS:-5}if ! wait-for-solr.sh --max-attempts "$max_try" --wait-seconds "$wait_seconds"; thendiff --git a/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh b/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.shindex 888b755e422..fb6f865a491 100755--- a/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh+++ b/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh@@ -20,7 +20,7 @@ TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"echo "Running base solr node w/embeddedZk - $container_name"-docker run --name "${container_name}" -d "$tag" solr-fg -c+docker run --name "${container_name}" -d "$tag" solr-fgwait_for_container_and_solr "${container_name}"@@ -32,7 +32,7 @@ container_cleanup "${container_name}-2"echo "Running additional solr node - $container_name-2"docker run --name "$container_name-2" -d \--env "ZK_HOST=${solr_ip}:9983" \- "$tag" solr-fg -c+ "$tag" solr-fgwait_for_container_and_solr "${container_name}-2"diff --git a/solr/docker/tests/cases/prometheus-exporter-cloud/test.sh b/solr/docker/tests/cases/prometheus-exporter-cloud/test.shindex 6407dfeb272..137207a8f22 100755--- a/solr/docker/tests/cases/prometheus-exporter-cloud/test.sh+++ b/solr/docker/tests/cases/prometheus-exporter-cloud/test.sh@@ -22,7 +22,7 @@ source "${TEST_DIR}/../../shared.sh"container_cleanup "${container_name}-solr"echo "Running $container_name"-docker run --name "${container_name}-solr" -d "$tag" solr-fg -c+docker run --name "${container_name}-solr" -d "$tag" solr-fgwait_for_container_and_solr "${container_name}-solr"diff --git a/solr/docker/tests/cases/user_volume/test.sh b/solr/docker/tests/cases/user_volume/test.shindex 2208db41a86..bf62888cf75 100755--- a/solr/docker/tests/cases/user_volume/test.sh+++ b/solr/docker/tests/cases/user_volume/test.sh@@ -62,7 +62,7 @@ docker run \-v "$mylogs:/var/solr/logs" \--user "$(id -u):$(id -g)" \--name "$container_name" \- -d "$tag"+ -d "$tag" --user-managedwait_for_container_and_solr "$container_name"diff --git a/solr/packaging/test/test_adminconsole_urls.bats b/solr/packaging/test/test_adminconsole_urls.batsindex 2ab86af39cd..ad0d2112c83 100644--- a/solr/packaging/test/test_adminconsole_urls.bats+++ b/solr/packaging/test/test_adminconsole_urls.bats@@ -29,7 +29,7 @@ teardown() {}@test "assert able to launch solr admin console" {- run solr start -c+ run solr startrun curl -s -o /dev/null -w "%{http_code}" http://localhost:${SOLR_PORT}/solr/diff --git a/solr/packaging/test/test_assert.bats b/solr/packaging/test/test_assert.batsindex db8750dafc9..3ef4382c2a3 100644--- a/solr/packaging/test/test_assert.bats+++ b/solr/packaging/test/test_assert.bats@@ -30,7 +30,7 @@ teardown() {@test "assert for non cloud mode" {solr assert --not-started http://localhost:${SOLR_PORT} --timeout 5000- run solr start+ run solr start --user-managedsolr assert --started http://localhost:${SOLR_PORT} --timeout 5000run solr assert --not-cloud http://localhost:${SOLR_PORT}/solr@@ -44,7 +44,7 @@ teardown() {}@test "assert for cloud mode" {- run solr start -c+ run solr startsolr assert --started http://localhost:${SOLR_PORT} --timeout 5000run solr assert --cloud http://localhost:${SOLR_PORT}diff --git a/solr/packaging/test/test_auth.bats b/solr/packaging/test/test_auth.batsindex 9dcabdaf8f9..eff96d9d81b 100644--- a/solr/packaging/test/test_auth.bats+++ b/solr/packaging/test/test_auth.bats@@ -36,7 +36,7 @@ setup() {}@test "auth enable/disable lifecycle" {- solr start -c+ solr startsolr auth enable --type basicAuth --credentials name:passwordsolr assert --started http://localhost:${SOLR_PORT} --timeout 5000diff --git a/solr/packaging/test/test_basic_auth.bats b/solr/packaging/test/test_basic_auth.batsindex 9cdebb7af18..f9b746661e3 100644--- a/solr/packaging/test/test_basic_auth.bats+++ b/solr/packaging/test/test_basic_auth.bats@@ -21,7 +21,7 @@ setup() {common_clean_setupecho "Starting Solr"- solr start -c -Denable.packages=true+ solr start -Denable.packages=true# The auth command exports some system variables that are injected as basic auth username and password,# however that defeats our test so fake that out via --solr-include-file param specifing a bogus path.diff --git a/solr/packaging/test/test_bats.bats b/solr/packaging/test/test_bats.batsindex 024a7b5d81b..fae2f5be371 100644--- a/solr/packaging/test/test_bats.bats+++ b/solr/packaging/test/test_bats.bats@@ -23,7 +23,7 @@ setup_file() {# set up paths and helperscommon_clean_setup- solr start -c -V+ solr start -V# echo $output >&3}diff --git a/solr/packaging/test/test_config.bats b/solr/packaging/test/test_config.batsindex f7f8ee7753e..243f4fb2689 100644--- a/solr/packaging/test/test_config.bats+++ b/solr/packaging/test/test_config.bats@@ -19,7 +19,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -c+ solr start}teardown_file() {diff --git a/solr/packaging/test/test_create.bats b/solr/packaging/test/test_create.batsindex e59a9055852..a7a4c6b15d8 100644--- a/solr/packaging/test/test_create.bats+++ b/solr/packaging/test/test_create.bats@@ -29,13 +29,13 @@ teardown() {}@test "create for non cloud mode" {- run solr start+ run solr start --user-managedrun solr create -c COLL_NAMEassert_output --partial "Created new core 'COLL_NAME'"}@test "create for cloud mode" {- run solr start -c+ run solr startrun solr create -c COLL_NAMEassert_output --partial "Created collection 'COLL_NAME'"}diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.batsindex 2bee792c4c3..c51cb744f5a 100644--- a/solr/packaging/test/test_create_collection.bats+++ b/solr/packaging/test/test_create_collection.bats@@ -19,7 +19,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -c+ solr start}teardown_file() {diff --git a/solr/packaging/test/test_delete_collection.bats b/solr/packaging/test/test_delete_collection.batsindex 0bc662b138b..d5db4263e70 100644--- a/solr/packaging/test/test_delete_collection.bats+++ b/solr/packaging/test/test_delete_collection.bats@@ -19,7 +19,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -c+ solr start}teardown_file() {diff --git a/solr/packaging/test/test_export.bats b/solr/packaging/test/test_export.batsindex d1c00bb33de..0fca4d3445c 100644--- a/solr/packaging/test/test_export.bats+++ b/solr/packaging/test/test_export.bats@@ -29,7 +29,7 @@ teardown() {}@test "Check export command" {- run solr start -c -e techproducts+ run solr start -e techproductsrun solr export --solr-collection-url "http://localhost:${SOLR_PORT}/solr/techproducts" -query "*:* -id:test" -out "${BATS_TEST_TMPDIR}/output"refute_output --partial 'Unrecognized option'@@ -62,7 +62,7 @@ teardown() {}@test "export fails on non cloud mode" {- run solr start+ run solr start --user-managedrun solr create -c COLL_NAMErun solr export -url "http://localhost:${SOLR_PORT}/solr/COLL_NAME"refute_output --partial 'Export complete'diff --git a/solr/packaging/test/test_extraction.bats b/solr/packaging/test/test_extraction.batsindex 346f1df431a..ed1c7285e9d 100644--- a/solr/packaging/test/test_extraction.bats+++ b/solr/packaging/test/test_extraction.bats@@ -35,7 +35,7 @@ teardown() {# Disable security manager to allow extraction# This appears to be a bug.export SOLR_SECURITY_MANAGER_ENABLED=false- solr start -c -Dsolr.modules=extraction+ solr start -Dsolr.modules=extractionsolr create -c gettingstarted -d _default@@ -60,7 +60,7 @@ teardown() {# Disable security manager to allow extraction# This appears to be a bug.export SOLR_SECURITY_MANAGER_ENABLED=false- solr start -c -Dsolr.modules=extraction+ solr start -Dsolr.modules=extractionsolr create -c content_extraction -d _default@@ -87,7 +87,7 @@ teardown() {# Disable security manager to allow extraction# This appears to be a bug.export SOLR_SECURITY_MANAGER_ENABLED=false- solr start -c -Dsolr.modules=extraction+ solr start -Dsolr.modules=extractionsolr create -c website_extraction -d _defaultdiff --git a/solr/packaging/test/test_healthcheck.bats b/solr/packaging/test/test_healthcheck.batsindex 14692f6561f..30edfeff235 100644--- a/solr/packaging/test/test_healthcheck.bats+++ b/solr/packaging/test/test_healthcheck.bats@@ -29,14 +29,14 @@ teardown() {}@test "healthcheck on cloud solr" {- solr start -c -e films+ solr start -e filmsrun solr healthcheck -c filmsrefute_output --partial 'error'}@test "healthcheck errors on standalone solr" {- solr start -e films+ solr start --user-managed -e filmsrun solr healthcheck -c filmsassert_output --partial 'Healthcheck tool only works in Solr Cloud mode'diff --git a/solr/packaging/test/test_modules.bats b/solr/packaging/test/test_modules.batsindex 8e0a2faae35..772e04344c4 100644--- a/solr/packaging/test/test_modules.bats+++ b/solr/packaging/test/test_modules.bats@@ -30,7 +30,7 @@ teardown() {}@test "SQL Module" {- run solr start -c -Dsolr.modules=sql+ run solr start -Dsolr.modules=sqlrun solr create -c COLL_NAMErun solr api --solr-url http://localhost:${SOLR_PORT}/solr/COLL_NAME/sql?stmt=select+id+from+COLL_NAME+limit+10assert_output --partial '"docs":'@@ -46,7 +46,7 @@ teardown() {# Start Solrexport SOLR_MODULES=hadoop-auth- solr start -c \+ solr start \-Dsolr.kerberos.principal=test \-Dsolr.kerberos.keytab=test \-Dsolr.kerberos.cookie.domain=test@@ -65,7 +65,7 @@ teardown() {echo "SOLR_MODULES=analysis-extras" > "${solr_include_file}"export SOLR_INCLUDE="${solr_include_file}"- run solr start -c+ run solr startrun solr create -c COLL_NAME -d test/analysis_extras_config/confassert_output --partial "Created collection 'COLL_NAME'"}diff --git a/solr/packaging/test/test_packages.bats b/solr/packaging/test/test_packages.batsindex 7de497a8d8c..d290bc6bc56 100644--- a/solr/packaging/test/test_packages.bats+++ b/solr/packaging/test/test_packages.bats@@ -29,7 +29,7 @@ teardown() {}@test "lifecycle of package" {- run solr start -c -Denable.packages=true+ run solr start -Denable.packages=truerun solr package --helpassert_output --partial "Add a repository to Solr"@@ -39,7 +39,7 @@ teardown() {}@test "deploying and undeploying a collection level package" {- run solr start -c -Denable.packages=true+ run solr start -Denable.packages=truesolr create -c foo-1.2@@ -62,7 +62,7 @@ teardown() {# connection to run. This could be updated with a local Repo server if we had# a package that is part of the Solr project to use.# @test "deploying and undeploying a cluster level package" {-# run solr start -c -Denable.packages=true+# run solr start -Denable.packages=true# run solr package add-repo splainer "https://raw.githubusercontent.com/o19s/splainer/main/solr-splainer-package/repo"# assert_output --partial "Added repository: splainer"diff --git a/solr/packaging/test/test_placement_plugin.bats b/solr/packaging/test/test_placement_plugin.batsindex 6187f6b8256..501c2b0c058 100644--- a/solr/packaging/test/test_placement_plugin.bats+++ b/solr/packaging/test/test_placement_plugin.bats@@ -30,7 +30,7 @@ teardown() {}@test "Affinity placement plugin using sysprop" {- run solr start -c -Dsolr.placementplugin.default=affinity+ run solr start -Dsolr.placementplugin.default=affinitysolr assert --cloud http://localhost:${SOLR_PORT} --timeout 3000run solr create -c COLL_NAMEcollection_exists COLL_NAME@@ -39,7 +39,7 @@ teardown() {@test "Random placement plugin using ENV" {export SOLR_PLACEMENTPLUGIN_DEFAULT=random- run solr start -c+ run solr startsolr assert --cloud http://localhost:${SOLR_PORT} --timeout 3000run solr create -c COLL_NAMEcollection_exists COLL_NAMEdiff --git a/solr/packaging/test/test_post.bats b/solr/packaging/test/test_post.batsindex 38652a8c5da..5544ef5220c 100644--- a/solr/packaging/test/test_post.bats+++ b/solr/packaging/test/test_post.bats@@ -19,7 +19,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -c -Dsolr.modules=extraction+ solr start -Dsolr.modules=extraction}teardown_file() {diff --git a/solr/packaging/test/test_postlogs.bats b/solr/packaging/test/test_postlogs.batsindex 6006baecfd0..ef6fe76953f 100644--- a/solr/packaging/test/test_postlogs.bats+++ b/solr/packaging/test/test_postlogs.bats@@ -19,7 +19,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -c+ solr start}teardown_file() {diff --git a/solr/packaging/test/test_prometheus.bats b/solr/packaging/test/test_prometheus.batsindex 9af9a515922..7a6555ef7a6 100644--- a/solr/packaging/test/test_prometheus.bats+++ b/solr/packaging/test/test_prometheus.bats@@ -31,7 +31,7 @@ teardown() {}@test "should start solr prometheus exporter that scrapes solr for metrics" {- solr start+ solr start --user-managedsolr assert --started http://localhost:${SOLR_PORT} --timeout 5000run solr create -c COLL_NAMEdiff --git a/solr/packaging/test/test_security_manager.bats b/solr/packaging/test/test_security_manager.batsindex 853c1002f07..886082208fd 100644--- a/solr/packaging/test/test_security_manager.bats+++ b/solr/packaging/test/test_security_manager.bats@@ -41,7 +41,7 @@ teardown() {export SOLR_SECURITY_MANAGER_ENABLED=trueexport SOLR_OPTS="-Dsolr.allowPaths=${backup_dir} -Djava.io.tmpdir=${test_tmp_dir}"- run solr start -c+ run solr startrun solr create -c COLL_NAMErun solr api --solr-url "http://localhost:${SOLR_PORT}/solr/admin/collections?action=BACKUP&name=test&collection=COLL_NAME&location=file://${backup_dir}"assert_output --partial '"status":0'diff --git a/solr/packaging/test/test_snapshots.bats b/solr/packaging/test/test_snapshots.batsindex 4a6135bbd01..3747cfe058d 100644--- a/solr/packaging/test/test_snapshots.bats+++ b/solr/packaging/test/test_snapshots.bats@@ -20,7 +20,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -c -e films+ solr start -e films}diff --git a/solr/packaging/test/test_ssl.bats b/solr/packaging/test/test_ssl.batsindex e6a2b9cce5e..7386be8ab8d 100644--- a/solr/packaging/test/test_ssl.bats+++ b/solr/packaging/test/test_ssl.bats@@ -51,7 +51,7 @@ teardown() {export SOLR_SSL_WANT_CLIENT_AUTH=falseexport SOLR_HOST=localhost- solr start -c+ solr startsolr assert --started https://localhost:${SOLR_PORT} --timeout 5000run solr create -c test --shards 2@@ -89,7 +89,7 @@ teardown() {export SOLR_SSL_CHECK_PEER_NAME=falseexport SOLR_HOST=127.0.0.1- solr start -c+ solr startsolr assert --started https://localhost:${SOLR_PORT} --timeout 5000run solr create -c test --shards 2@@ -119,7 +119,7 @@ teardown() {# Restart the server enabling the SNI hostcheckexport SOLR_SSL_CHECK_PEER_NAME=falseexport SOLR_OPTS="${SOLR_OPTS} -Dsolr.jetty.ssl.sniHostCheck=true"- solr restart -c+ solr restart# This should fail the SNI Hostname checkrun ! solr api --verbose --solr-url "https://localhost:${SOLR_PORT}/solr/admin/collections?action=CLUSTERSTATUS"assert_output --partial 'Invalid SNI'@@ -151,7 +151,7 @@ teardown() {export SOLR_SSL_CHECK_PEER_NAME=trueexport SOLR_HOST=localhost- solr start -c+ solr startsolr assert --started https://localhost:${SOLR_PORT} --timeout 5000solr auth enable --type basicAuth --credentials name:password@@ -208,7 +208,7 @@ teardown() {export SOLR_HOST=localhostexport SOLR_SECURITY_MANAGER_ENABLED=true- run solr start -c+ run solr startsolr assert --started https://localhost:${SOLR_PORT} --timeout 5000@@ -322,8 +322,8 @@ teardown() {export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=falseexport SOLR_HOST=localhost- solr start -c- solr start -c -z localhost:${ZK_PORT} -p ${SOLR2_PORT}+ solr start+ solr start -z localhost:${ZK_PORT} -p ${SOLR2_PORT}# Test Client connections, which do not need the server keystore/truststore(@@ -357,7 +357,7 @@ teardown() {# Turn on client hostname verification, and start a new Solr node since the property is a server setting.# Test that it fails because the client cert does not use "localhost"export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true- solr start -c -z localhost:${ZK_PORT} -p ${SOLR3_PORT}+ solr start -z localhost:${ZK_PORT} -p ${SOLR3_PORT}# We can't check if the server has come up, because we can't connect to it, so just waitsleep 5@@ -461,8 +461,8 @@ teardown() {export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=trueexport SOLR_HOST=localhost- solr start -c- solr start -c -z localhost:${ZK_PORT} -p ${SOLR2_PORT}+ solr start+ solr start -z localhost:${ZK_PORT} -p ${SOLR2_PORT}export SOLR_SSL_KEY_STORE=export SOLR_SSL_KEY_STORE_PASSWORD=@@ -526,7 +526,7 @@ teardown() {# server1 will run on $SOLR_PORT and will use server1.keystoreexport SOLR_SSL_KEY_STORE=$ssl_dir/server1.keystore.p12export SOLR_SSL_TRUST_STORE=$ssl_dir/server1.keystore.p12- solr start -c --jvm-opts "-Dsolr.jetty.sslContext.reload.scanInterval=1 -DsocketTimeout=5000"+ solr start --jvm-opts "-Dsolr.jetty.sslContext.reload.scanInterval=1 -DsocketTimeout=5000"solr assert --started https://localhost:${SOLR_PORT} --timeout 5000# server2 will run on $SOLR2_PORT and will use server2.keystore. Initially, this is the same as server1.keystore@@ -534,7 +534,7 @@ teardown() {export SOLR_SSL_TRUST_STORE=$ssl_dir/server2.keystore.p12# leaving -a instead of --jvm-opts for back compat testing.- solr start -c -z localhost:${ZK_PORT} -p ${SOLR2_PORT} -a "-Dsolr.jetty.sslContext.reload.scanInterval=1 -DsocketTimeout=5000"+ solr start -z localhost:${ZK_PORT} -p ${SOLR2_PORT} -a "-Dsolr.jetty.sslContext.reload.scanInterval=1 -DsocketTimeout=5000"solr assert --started https://localhost:${SOLR2_PORT} --timeout 5000# "test" collection is two shards, meaning there must be communication between shards for queries (handled by http shard handler factory)diff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.batsindex c185128b219..546cb9821cb 100644--- a/solr/packaging/test/test_start_solr.bats+++ b/solr/packaging/test/test_start_solr.bats@@ -30,9 +30,12 @@ teardown() {@test "SOLR-11740 check 'solr stop' connection" {solr start- solr start -p ${SOLR2_PORT}+ solr start --user-managed -p ${SOLR2_PORT}solr assert --started http://localhost:${SOLR_PORT} --timeout 5000+ solr assert --cloud http://localhost:${SOLR_PORT} --timeout 5000solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000+ solr assert --not-cloud http://localhost:${SOLR2_PORT} --timeout 5000+run bash -c 'solr stop --all 2>&1'refute_output --partial 'forcefully killing'}@@ -43,6 +46,9 @@ teardown() {solr start -p ${SOLR2_PORT}solr assert --started http://localhost:${SOLR_PORT} --timeout 5000solr assert --started http://localhost:${SOLR2_PORT} --timeout 5000++ solr assert --cloud http://localhost:${SOLR_PORT} --timeout 5000+ solr assert --cloud http://localhost:${SOLR2_PORT} --timeout 5000run solr stop -p ${SOLR2_PORT}solr assert --not-started http://localhost:${SOLR2_PORT} --timeout 5000diff --git a/solr/packaging/test/test_zk.bats b/solr/packaging/test/test_zk.batsindex f823f70c9a1..c6a6b184028 100644--- a/solr/packaging/test/test_zk.bats+++ b/solr/packaging/test/test_zk.bats@@ -19,7 +19,7 @@ load bats_helpersetup_file() {common_clean_setup- solr start -DminStateByteLenForCompression=0 -c+ solr start -DminStateByteLenForCompression=0}teardown_file() {diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager-internals.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager-internals.adocindex aedc7166fd2..df8ed1f3907 100644--- a/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager-internals.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager-internals.adoc@@ -48,7 +48,7 @@ Start all your nodes with the system property `-Denable.packages=true` to use th[source,bash]-----bin/solr start -c -Denable.packages=true+bin/solr start -Denable.packages=true----=== Upload Your Keysdiff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adocindex 6ebaa538853..d4fd1754234 100644--- a/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc+++ b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc@@ -46,7 +46,7 @@ To enable it, start all Solr nodes with the `-Denable.packages=true` parameter.[source,bash]-----$ bin/solr start -c -Denable.packages=true+$ bin/solr start -Denable.packages=true----WARNING: There are security consequences to enabling the package manager.diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adocindex 62f43f6d54e..f1906e455f7 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/collection-management.adoc@@ -24,7 +24,7 @@ All of the examples in this section assume you are running the "techproducts" So[source,bash]-----bin/solr start -c -e techproducts+bin/solr start -e techproducts----[[create]]diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adocindex afd58cccf1e..9083b5107d7 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/kerberos-authentication-plugin.adoc@@ -448,7 +448,7 @@ Note you also need to customize the `-z` property as appropriate for the locatio[source,bash]-----$ bin/solr start -c -z server1:2181,server2:2181,server3:2181/solr+$ bin/solr start -z server1:2181,server2:2181,server3:2181/solr----NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from the above command.diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adocindex 66e0408efe1..c66d8492e23 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/replica-management.adoc@@ -26,7 +26,7 @@ All of the examples in this section assume you are running the "techproducts" So[source,bash]-----bin/solr start -c -e techproducts+bin/solr start -e techproducts----[[addreplica]]diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adocindex 54f04351c85..c2d0c050965 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/shard-management.adoc@@ -27,7 +27,7 @@ All of the examples in this section assume you are running the "techproducts" So[source,bash]-----bin/solr start -c -e techproducts+bin/solr start -e techproducts----[[splitshard]]diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adocindex 442519d52bf..bb7c09dbca8 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-control-script-reference.adoc@@ -260,7 +260,7 @@ If `ZK_HOST` is not specified in `solr.in.sh`/`solr.in.cmd` and this option is n+Set the `ZK_CREATE_CHROOT` environment variable to true if your ZK host has a chroot path, and you want to create it automatically.+-*Example*: `bin/solr start -c -z server1:2181,server2:2181`+*Example*: `bin/solr start -z server1:2181,server2:2181``--force`::+diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adocindex 0242439e2af..292c3b0dbe7 100644--- a/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/solr-on-hdfs.adoc@@ -67,7 +67,7 @@ All dynamically created collections will create the appropriate directories auto[source,bash]-----bin/solr start -c -Dsolr.directoryFactory=HdfsDirectoryFactory+bin/solr start -Dsolr.directoryFactory=HdfsDirectoryFactory-Dsolr.lock.type=hdfs-Dsolr.hdfs.home=hdfs://host:port/path----diff --git a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adocindex f6a2ea678d7..3afdadd3781 100644--- a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-aws.adoc@@ -206,7 +206,7 @@ Inside the `ec2-101-1-2-3.us-east-2.compute.amazonaws.com` (`solr-node-1`)$ cd $SOLR_HOME# start Solr node on 8983 and ZooKeeper will start on 9983 (8983+1000)-$ bin/solr start -c -p 8983 --host solr-node-1+$ bin/solr start -p 8983 --host solr-node-1----+On the other node, `ec2-101-4-5-6.us-east-2.compute.amazonaws.com` (`solr-node-2`)@@ -216,7 +216,7 @@ On the other node, `ec2-101-4-5-6.us-east-2.compute.amazonaws.com` (`solr-node-2$ cd $SOLR_HOME# start Solr node on 8983 and connect to ZooKeeper running on first node-$ bin/solr start -c -p 8983 --host solr-node-2 -z solr-node-1:9983+$ bin/solr start -p 8983 --host solr-node-2 -z solr-node-1:9983----. Inspect and Verify.@@ -328,7 +328,7 @@ $ bin/zkServer.sh start$ cd $SOLR_HOME# start Solr node on 8983 and connect to ZooKeeper running on ZooKeeper node-$ bin/solr start -c -p 8983 --host solr-node-1 -z zookeeper-node:2181+$ bin/solr start -p 8983 --host solr-node-1 -z zookeeper-node:2181----+. On the second Solr node (`solr-node-2`), again start Solr and tell it where to find ZooKeeper.@@ -338,7 +338,7 @@ $ bin/solr start -c -p 8983 --host solr-node-1 -z zookeeper-node:2181$ cd $SOLR_HOME# start Solr node on 8983 and connect to ZooKeeper running on ZooKeeper node-$ bin/solr start -c -p 8983 --host solr-node-2 -z zookeeper-node:2181+$ bin/solr start -p 8983 --host solr-node-2 -z zookeeper-node:2181----[TIP]diff --git a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adocindex c715ee01149..86242511302 100644--- a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-films.adoc@@ -32,7 +32,7 @@ If you did, though, and need to restart Solr, issue these commands:[,console]-----$ bin/solr start -c -p 8983 --solr-home example/cloud/node1/solr+$ bin/solr start -p 8983 --solr-home example/cloud/node1/solr----This starts the first node.@@ -40,7 +40,7 @@ When it's done start the second node, and tell it how to connect to ZooKeeper:[,console]-----$ bin/solr start -c -p 7574 --solr-home example/cloud/node2/solr -z localhost:9983+$ bin/solr start -p 7574 --solr-home example/cloud/node2/solr -z localhost:9983----NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:deployment-guide:zookeeper-ensemble#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from the above command.diff --git a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-five-minutes.adoc b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-five-minutes.adocindex c072abeda36..d4048a6d1d2 100644--- a/solr/solr-ref-guide/modules/getting-started/pages/tutorial-five-minutes.adoc+++ b/solr/solr-ref-guide/modules/getting-started/pages/tutorial-five-minutes.adoc@@ -26,7 +26,7 @@ To start another Solr node and have it join the cluster alongside the first node[,console]-----$ bin/solr start -c -z localhost:9983 -p 8984+$ bin/solr start -z localhost:9983 -p 8984----