Apache Solr open-source search software
SOLR-18269: Restore -c as a no-op function for bin/solr start (#4473)
Eric Pughc2123ca736c5
diff --git a/changelog/unreleased/SOLR-18269.yml b/changelog/unreleased/SOLR-18269.ymlnew file mode 100644index 00000000000..4e87550fdf0--- /dev/null+++ b/changelog/unreleased/SOLR-18269.yml@@ -0,0 +1,7 @@+title: Restore -c option as a no-op to bin/solr start script to simplify scripts that interact with both Solr 10 and previous versions of Solr.+type: changed+authors:+ - name: Eric Pugh+links:+ - name: SOLR-18269+ url: https://issues.apache.org/jira/browse/SOLR-18269diff --git a/solr/bin/solr b/solr/bin/solrindex eaa417ca90d..e61808d080c 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -682,11 +682,27 @@ SOLR_OPTS=(${SOLR_OPTS:-})SCRIPT_SOLR_OPTS=()PASS_TO_RUN_EXAMPLE=()SOLR_MODE="solrcloud"+CLOUD_FLAG_SET=false+USER_MANAGED_FLAG_SET=falseif [ $# -gt 0 ]; thenwhile true; docase "${1:-}" in+ -c|--cloud|-cloud)+ if [[ "$USER_MANAGED_FLAG_SET" == "true" ]]; then+ print_usage "$SCRIPT_CMD" "Cannot combine -c/--cloud with --user-managed; choose one."+ exit 1+ fi+ echo "WARNING: -c/--cloud is a no-op. Solr starts in cloud mode by default."+ CLOUD_FLAG_SET=true+ shift+ ;;--user-managed)+ if [[ "$CLOUD_FLAG_SET" == "true" ]]; then+ print_usage "$SCRIPT_CMD" "Cannot combine -c/--cloud with --user-managed; choose one."+ exit 1+ fi+ USER_MANAGED_FLAG_SET=trueSOLR_MODE="user-managed"PASS_TO_RUN_EXAMPLE+=("--user-managed")shiftdiff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex e30cc4416fa..743d8fb7cdc 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -383,6 +383,9 @@ IF "%1"=="--foreground" goto set_foreground_modeIF "%1"=="--verbose" 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_modeIF "%1"=="--user-managed" goto set_user_managed_modeIF "%1"=="--server-dir" goto set_server_dirIF "%1"=="--solr-home" goto set_solr_home_dir@@ -444,7 +447,21 @@ set SOLR_LOG_LEVEL=WARNSHIFTgoto parse_args+:set_cloud_mode+IF "%SOLR_MODE%"=="user-managed" (+ set "SCRIPT_ERROR=Cannot combine -c/--cloud with --user-managed; choose one."+ goto invalid_cmd_line+)+@echo WARNING: -c/--cloud is a no-op. Solr starts in cloud mode by default.+set CLOUD_FLAG_SET=true+SHIFT+goto parse_args+:set_user_managed_mode+IF "%CLOUD_FLAG_SET%"=="true" (+ set "SCRIPT_ERROR=Cannot combine -c/--cloud with --user-managed; choose one."+ goto invalid_cmd_line+)set SOLR_MODE=user-managedset "PASS_TO_RUN_EXAMPLE=--user-managed !PASS_TO_RUN_EXAMPLE!"SHIFTdiff --git a/solr/packaging/test/test_start_solr.bats b/solr/packaging/test/test_start_solr.batsindex a24ceadd24c..0b206dc7278 100644--- a/solr/packaging/test/test_start_solr.bats+++ b/solr/packaging/test/test_start_solr.bats@@ -96,6 +96,14 @@ teardown() {solr assert --started http://localhost:${SOLR_PORT} --timeout 5000}+@test "-c flag prints no-op warning and still starts in cloud mode" {+ run solr start -c+ assert_output --partial 'WARNING: -c/--cloud is a no-op. Solr starts in cloud mode by default.'++ solr assert --started http://localhost:${SOLR_PORT} --timeout 5000+ solr assert --cloud http://localhost:${SOLR_PORT} --timeout 5000+}+@test "bootstrapping a configset" {local confdir_path="${SOLR_TIP}/server/solr/configsets/sample_techproducts_configs/conf"