From 09280bbf910f750d0e8d33eb9a31e3c713df11f3 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 11 Oct 2024 13:36:06 -0600
Subject: [PATCH 1/2] SOLR-17467: Start solr in Cloud mode, introduce
 --user-managed switch for User Managed mode (#2729)

Flip the default start mode to SolrCloud.  Update the docs and the tests and the tutorials.   This PR doesn't do anything to help an existing setup upgrade however.
---
 dev-docs/running-in-docker.adoc               |  4 ++--
 solr/CHANGES.txt                              |  2 ++
 solr/bin/solr                                 | 22 +++++++----------
 solr/bin/solr.cmd                             | 21 ++++++++--------
 .../org/apache/solr/cli/RunExampleTool.java   | 15 ++++++------
 .../src/java/org/apache/solr/cli/SolrCLI.java |  2 +-
 .../solr/cli/TestSolrCLIRunExample.java       | 20 +++++++++++-----
 solr/docker/gradle-help.txt                   |  4 ++--
 solr/docker/scripts/solr-create               |  2 +-
 solr/docker/scripts/solr-demo                 |  2 +-
 solr/docker/scripts/solr-precreate            |  2 +-
 solr/docker/scripts/start-local-solr          |  2 +-
 .../cloud_multi_node_embedded_zk/test.sh      |  4 ++--
 .../cases/prometheus-exporter-cloud/test.sh   |  2 +-
 solr/docker/tests/cases/user_volume/test.sh   |  2 +-
 .../test/test_adminconsole_urls.bats          |  2 +-
 solr/packaging/test/test_assert.bats          |  4 ++--
 solr/packaging/test/test_auth.bats            |  2 +-
 solr/packaging/test/test_basic_auth.bats      |  2 +-
 solr/packaging/test/test_bats.bats            |  2 +-
 solr/packaging/test/test_config.bats          |  2 +-
 solr/packaging/test/test_create.bats          |  4 ++--
 .../test/test_create_collection.bats          |  2 +-
 .../test/test_delete_collection.bats          |  2 +-
 solr/packaging/test/test_export.bats          |  4 ++--
 solr/packaging/test/test_extraction.bats      |  6 ++---
 solr/packaging/test/test_healthcheck.bats     |  4 ++--
 solr/packaging/test/test_modules.bats         |  6 ++---
 solr/packaging/test/test_packages.bats        |  6 ++---
 .../packaging/test/test_placement_plugin.bats |  4 ++--
 solr/packaging/test/test_post.bats            |  2 +-
 solr/packaging/test/test_postlogs.bats        |  2 +-
 solr/packaging/test/test_prometheus.bats      |  2 +-
 .../packaging/test/test_security_manager.bats |  2 +-
 solr/packaging/test/test_snapshots.bats       |  2 +-
 solr/packaging/test/test_ssl.bats             | 24 +++++++++----------
 solr/packaging/test/test_start_solr.bats      |  8 ++++++-
 solr/packaging/test/test_zk.bats              |  2 +-
 .../pages/package-manager-internals.adoc      |  2 +-
 .../pages/package-manager.adoc                |  2 +-
 .../pages/collection-management.adoc          |  2 +-
 .../pages/kerberos-authentication-plugin.adoc |  2 +-
 .../pages/replica-management.adoc             |  2 +-
 .../pages/shard-management.adoc               |  2 +-
 .../pages/solr-control-script-reference.adoc  |  2 +-
 .../deployment-guide/pages/solr-on-hdfs.adoc  |  2 +-
 .../getting-started/pages/tutorial-aws.adoc   |  8 +++----
 .../getting-started/pages/tutorial-films.adoc |  4 ++--
 .../pages/tutorial-five-minutes.adoc          |  2 +-
 49 files changed, 120 insertions(+), 112 deletions(-)

diff --git a/dev-docs/running-in-docker.adoc b/dev-docs/running-in-docker.adoc
index 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.txt
index 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/solr
index 4ab26565e92..8a993233a0a 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -367,14 +367,13 @@ function print_usage() {
 
   if [[ "$CMD" == "start" || "$CMD" == "restart" ]]; then
     echo ""
-    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=false
 SOLR_OPTS=(${SOLR_OPTS:-})
 SCRIPT_SOLR_OPTS=()
 PASS_TO_RUN_EXAMPLE=()
+SOLR_MODE="solrcloud"
 
 if [ $# -gt 0 ]; then
   while true; do
     case "${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 ]; then
               exit 1
             fi
             ZK_HOST="$2"
-            SOLR_MODE="solrcloud"
             PASS_TO_RUN_EXAMPLE+=("-z" "$ZK_HOST")
             shift 2
         ;;
@@ -1141,11 +1140,6 @@ if [ "${#GC_LOG_OPTS[@]}" -gt 0 ]; then
   fi
 fi
 
-# 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.cmd
index 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_verbose
 IF "%1"=="-v" goto set_verbose
 IF "%1"=="-q" goto set_warn
 IF "%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_mode
 IF "%1"=="-d" goto set_server_dir
 IF "%1"=="--dir" goto set_server_dir
 IF "%1"=="--server-dir" goto set_server_dir
@@ -462,8 +459,8 @@ set SOLR_LOG_LEVEL=WARN
 SHIFT
 goto parse_args
 
-:set_cloud_mode
-set SOLR_MODE=solrcloud
+:set_user_managed_mode
+set SOLR_MODE=user-managed
 SHIFT
 goto 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=solrcloud
 
 IF "%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.java
index 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 List<Option> getOptions() {
             .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 @@ protected void runExample(CommandLine cli, String exampleName) throws Exception
     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 @@ protected void runCloudExample(CommandLine cli) throws Exception {
       // start the other nodes
       for (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 @@ protected Map<String, Object> startSolr(
     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.java
index 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 @@ private static void printHelp() {
         "  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.java
index 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 int execute(org.apache.commons.exec.CommandLine cmd) throws IOException {
       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 void testFilmsExample() throws Exception {
   }
 
   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 @@ protected void testExample(String exampleName) throws Exception {
 
       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 stdout
diff --git a/solr/docker/gradle-help.txt b/solr/docker/gradle-help.txt
index 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,demo
 
 Exclude specific tests:
    EnvVar: SOLR_DOCKER_TESTS_EXCLUDE
-   Gradle Property: -Psolr.docker.tests.exclude
+   Gradle Property: -Psolr.docker.tests.exclude=cloud_multi_node_embedded_zk,demo
 
 The 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-create
index 41f71500942..5868353ee21 100755
--- a/solr/docker/scripts/solr-create
+++ b/solr/docker/scripts/solr-create
@@ -75,4 +75,4 @@ else
     fi
 fi
 
-exec solr-fg
+exec solr-fg --user-managed
diff --git a/solr/docker/scripts/solr-demo b/solr/docker/scripts/solr-demo
index 29e5b0625de..2db2828f3fc 100755
--- a/solr/docker/scripts/solr-demo
+++ b/solr/docker/scripts/solr-demo
@@ -50,4 +50,4 @@ else
     fi
 fi
 
-exec solr-fg
+exec solr-fg --user-managed
diff --git a/solr/docker/scripts/solr-precreate b/solr/docker/scripts/solr-precreate
index 96277e1d409..7f6c10dd6b1 100755
--- a/solr/docker/scripts/solr-precreate
+++ b/solr/docker/scripts/solr-precreate
@@ -36,4 +36,4 @@ source run-initdb
 
 precreate-core "$@"
 
-exec solr-fg
+exec solr-fg --user-managed
diff --git a/solr/docker/scripts/start-local-solr b/solr/docker/scripts/start-local-solr
index 633fca3d686..03284b824f5 100755
--- a/solr/docker/scripts/start-local-solr
+++ b/solr/docker/scripts/start-local-solr
@@ -23,7 +23,7 @@ if [[ "${VERBOSE:-}" == "yes" ]]; then
 fi
 
 echo "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-managed
 max_try=${MAX_TRY:-12}
 wait_seconds=${WAIT_SECONDS:-5}
 if ! wait-for-solr.sh --max-attempts "$max_try" --wait-seconds "$wait_seconds"; then
diff --git a/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh b/solr/docker/tests/cases/cloud_multi_node_embedded_zk/test.sh
index 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-fg
 
 wait_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-fg
 
 wait_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.sh
index 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-fg
 
 wait_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.sh
index 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-managed
 
 wait_for_container_and_solr "$container_name"
 
diff --git a/solr/packaging/test/test_adminconsole_urls.bats b/solr/packaging/test/test_adminconsole_urls.bats
index 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 start
 
   run 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.bats
index 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-managed
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
 
   run 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 start
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
 
   run solr assert --cloud http://localhost:${SOLR_PORT}
diff --git a/solr/packaging/test/test_auth.bats b/solr/packaging/test/test_auth.bats
index 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 start
   solr auth enable --type basicAuth --credentials name:password
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
 
diff --git a/solr/packaging/test/test_basic_auth.bats b/solr/packaging/test/test_basic_auth.bats
index 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_setup
   
   echo "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.bats
index 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 helpers
   common_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.bats
index f7f8ee7753e..243f4fb2689 100644
--- a/solr/packaging/test/test_config.bats
+++ b/solr/packaging/test/test_config.bats
@@ -19,7 +19,7 @@ load bats_helper
 
 setup_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.bats
index 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-managed
   run solr create -c COLL_NAME
   assert_output --partial "Created new core 'COLL_NAME'"
 }
 
 @test "create for cloud mode" {
-  run solr start -c
+  run solr start
   run solr create -c COLL_NAME
   assert_output --partial "Created collection 'COLL_NAME'"
 }
diff --git a/solr/packaging/test/test_create_collection.bats b/solr/packaging/test/test_create_collection.bats
index 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_helper
 
 setup_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.bats
index 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_helper
 
 setup_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.bats
index 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 techproducts
   run 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-managed
   run solr create -c COLL_NAME
   run 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.bats
index 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=extraction
   
   
   solr 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=extraction
   
   solr 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=extraction
   
   solr create -c website_extraction -d _default
   
diff --git a/solr/packaging/test/test_healthcheck.bats b/solr/packaging/test/test_healthcheck.bats
index 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 films
   run solr healthcheck -c films
   refute_output --partial 'error'
   
 }
 
 @test "healthcheck errors on standalone solr" {
-  solr start -e films
+  solr start --user-managed -e films
   run solr healthcheck -c films
   assert_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.bats
index 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=sql
   run solr create -c COLL_NAME
   run solr api --solr-url http://localhost:${SOLR_PORT}/solr/COLL_NAME/sql?stmt=select+id+from+COLL_NAME+limit+10
   assert_output --partial '"docs":'
@@ -46,7 +46,7 @@ teardown() {
 
   # Start Solr
   export 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 start
   run solr create -c COLL_NAME -d test/analysis_extras_config/conf
   assert_output --partial "Created collection 'COLL_NAME'"
 }
diff --git a/solr/packaging/test/test_packages.bats b/solr/packaging/test/test_packages.bats
index 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=true
 
   run solr package --help
   assert_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=true
 
   solr 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.bats
index 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=affinity
   solr assert --cloud http://localhost:${SOLR_PORT} --timeout 3000
   run solr create -c COLL_NAME
   collection_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 start
   solr assert --cloud http://localhost:${SOLR_PORT} --timeout 3000
   run solr create -c COLL_NAME
   collection_exists COLL_NAME
diff --git a/solr/packaging/test/test_post.bats b/solr/packaging/test/test_post.bats
index 38652a8c5da..5544ef5220c 100644
--- a/solr/packaging/test/test_post.bats
+++ b/solr/packaging/test/test_post.bats
@@ -19,7 +19,7 @@ load bats_helper
 
 setup_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.bats
index 6006baecfd0..ef6fe76953f 100644
--- a/solr/packaging/test/test_postlogs.bats
+++ b/solr/packaging/test/test_postlogs.bats
@@ -19,7 +19,7 @@ load bats_helper
 
 setup_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.bats
index 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-managed
   solr assert --started http://localhost:${SOLR_PORT} --timeout 5000
   
   run solr create -c COLL_NAME
diff --git a/solr/packaging/test/test_security_manager.bats b/solr/packaging/test/test_security_manager.bats
index 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=true
   export SOLR_OPTS="-Dsolr.allowPaths=${backup_dir} -Djava.io.tmpdir=${test_tmp_dir}"
-  run solr start -c
+  run solr start
   run solr create -c COLL_NAME
   run 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.bats
index 4a6135bbd01..3747cfe058d 100644
--- a/solr/packaging/test/test_snapshots.bats
+++ b/solr/packaging/test/test_snapshots.bats
@@ -20,7 +20,7 @@ load bats_helper
 setup_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.bats
index 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=false
   export SOLR_HOST=localhost
 
-  solr start -c
+  solr start
   solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
 
   run solr create -c test --shards 2
@@ -89,7 +89,7 @@ teardown() {
   export SOLR_SSL_CHECK_PEER_NAME=false
   export SOLR_HOST=127.0.0.1
 
-  solr start -c
+  solr start
   solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
 
   run solr create -c test --shards 2
@@ -119,7 +119,7 @@ teardown() {
   # Restart the server enabling the SNI hostcheck
   export SOLR_SSL_CHECK_PEER_NAME=false
   export SOLR_OPTS="${SOLR_OPTS} -Dsolr.jetty.ssl.sniHostCheck=true"
-  solr restart -c
+  solr restart
   # This should fail the SNI Hostname check
   run ! 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=true
   export SOLR_HOST=localhost
 
-  solr start -c
+  solr start
   solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
   solr auth enable --type basicAuth --credentials name:password
 
@@ -208,7 +208,7 @@ teardown() {
   export SOLR_HOST=localhost
   export SOLR_SECURITY_MANAGER_ENABLED=true
 
-  run solr start -c
+  run solr start
 
   solr assert --started https://localhost:${SOLR_PORT} --timeout 5000
 
@@ -322,8 +322,8 @@ teardown() {
   export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=false
   export 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 wait
   sleep 5
@@ -461,8 +461,8 @@ teardown() {
   export SOLR_SSL_CLIENT_HOSTNAME_VERIFICATION=true
   export 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.keystore
   export SOLR_SSL_KEY_STORE=$ssl_dir/server1.keystore.p12
   export 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.bats
index 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 5000
   solr 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 5000
   solr 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 5000
 
   run solr stop -p ${SOLR2_PORT}
   solr assert --not-started http://localhost:${SOLR2_PORT} --timeout 5000
diff --git a/solr/packaging/test/test_zk.bats b/solr/packaging/test/test_zk.bats
index f823f70c9a1..c6a6b184028 100644
--- a/solr/packaging/test/test_zk.bats
+++ b/solr/packaging/test/test_zk.bats
@@ -19,7 +19,7 @@ load bats_helper
 
 setup_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.adoc
index 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 Keys
diff --git a/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc b/solr/solr-ref-guide/modules/configuration-guide/pages/package-manager.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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.adoc
index 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
 ----
 
 

From 8ea6525389dd99f306f64a1f4bcc9987f9d7ff64 Mon Sep 17 00:00:00 2001
From: Eric Pugh <epugh@opensourceconnections.com>
Date: Fri, 11 Oct 2024 17:14:02 -0600
Subject: [PATCH 2/2] fix xref references (#2757)

---
 .../modules/deployment-guide/pages/client-apis.adoc             | 2 +-
 .../deployment-guide/pages/zookeeper-file-management.adoc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adoc
index 792d9a05952..56d49abd4ef 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/client-apis.adoc
@@ -66,7 +66,7 @@ Parsing the responses is a slightly more thorny problem.
 Fortunately, Solr makes it easy to choose an output format that will be easy to handle on the client side.
 
 Specify a response format using the `wt` parameter in a query.
-The available response formats are documented in xref:query-guide:response-writers.adoc.
+The available response formats are documented in xref:query-guide:response-writers.adoc[Response Writers].
 
 Most client APIs hide this detail for you, so for many types of client applications, you won't ever have to specify a `wt` parameter.
 In JavaScript, however, the interface to Solr is a little closer to the metal, so you will need to add this parameter yourself.
diff --git a/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adoc b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adoc
index eb61066c529..48207127dfb 100644
--- a/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adoc
+++ b/solr/solr-ref-guide/modules/deployment-guide/pages/zookeeper-file-management.adoc
@@ -94,4 +94,4 @@ If you for example would like to enable authentication, you can push your `secur
 bin/solr zk cp file:local/file/path/to/security.json zk:/security.json -z localhost:2181
 ----
 
-NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files,Updating Solr Include Files>>) you can omit `-z <zk host string>` from the above command.
+NOTE: If you have defined `ZK_HOST` in `solr.in.sh`/`solr.in.cmd` (see xref:zookeeper-ensemble.adoc#updating-solr-include-files[Updating Solr Include Files]) you can omit `-z <zk host string>` from the above command.