From fa85737d85bbeff92410e412377e80dda8e50ff2 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Sat, 15 Feb 2025 21:03:16 -0500 Subject: [PATCH 1/6] Refresh the start examples. Downplay SolrCloud mode, and make sure to introduce how to run User Managed mode. Reference standalone since most folks know it as that. --- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) 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 e88b0dada7f..ee30f7b07d9 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -409,16 +409,16 @@ private static void printHelp() { print( " healthcheck, create, delete, auth, assert, config, export, api, package, post, stream,"); print( - " zk ls, zk cp, zk rm , zk mv, zk mkroot, zk upconfig, zk downconfig,"); + " zk ls, zk cp, zk rm , zk mvStandalone server example, zk mkroot, zk upconfig, zk downconfig,"); print( " snapshot-create, snapshot-list, snapshot-delete, snapshot-export, snapshot-prepare-export"); print(""); - print(" Standalone server example (start Solr running in the background on port 8984):"); + print(" Start Solr running in the background on port 8984:"); print(""); printGreen(" ./solr start -p 8984"); print(""); print( - " 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):"); + " Start Solr connecting to external Zookeeper at localhost:2181, with 1g max heap size and remote Java debug options enabled):"); print(""); printGreen( " ./solr start -m 1g -z localhost:2181 --jvm-opts \"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044\""); @@ -426,6 +426,12 @@ private static void printHelp() { print( " Omit '-z localhost:2181' from the above command if you have defined ZK_HOST in solr.in.sh."); print(""); + print( + " Start Solr in User Managed (aka standalone) mode:"); + print(""); + printGreen( + " ./solr start --user-managed"); + print(""); print("Global Options:"); print(" -v, --version Print version information and quit"); print(" --verbose Enable verbose mode"); From 0cc627880db6eebc3c1f63d02d78338c690889a3 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Sat, 15 Feb 2025 21:08:16 -0500 Subject: [PATCH 2/6] Capitalize a sentence --- solr/bin/solr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/bin/solr b/solr/bin/solr index e8d3b005248..b1ccb81693d 100755 --- a/solr/bin/solr +++ b/solr/bin/solr @@ -631,7 +631,7 @@ if [[ "$SCRIPT_CMD" == "auth" ]]; then exit $? fi -# at this point all tools that have a custom run process, like "status" and "auth" have been run and exited. +# At this point all tools that have a custom run process, like "status" and "auth" have been run and exited. # Unless a command is one of the ones in the if clause below, we will just run it with the default run_tool function and then exit. if [ "$SCRIPT_CMD" != "start" ] && [ "$SCRIPT_CMD" != "stop" ] && [ "$SCRIPT_CMD" != "restart" ]; then # hand off the command to the SolrCLI and let it handle the option parsing and validation From 3d1bed4201de9941526906ce2515bb602a99ae60 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Sat, 15 Feb 2025 21:30:40 -0500 Subject: [PATCH 3/6] lint --- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 ee30f7b07d9..4d76c054a93 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -426,11 +426,9 @@ private static void printHelp() { print( " Omit '-z localhost:2181' from the above command if you have defined ZK_HOST in solr.in.sh."); print(""); - print( - " Start Solr in User Managed (aka standalone) mode:"); + print(" Start Solr in User Managed (aka standalone) mode:"); print(""); - printGreen( - " ./solr start --user-managed"); + printGreen(" ./solr start --user-managed"); print(""); print("Global Options:"); print(" -v, --version Print version information and quit"); From b1df4c0589cab2385756f9998cf83e5b9258736d Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Wed, 26 Feb 2025 08:41:15 -0500 Subject: [PATCH 4/6] respond to feedback --- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 4d76c054a93..f971bbbd913 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -409,11 +409,11 @@ private static void printHelp() { print( " healthcheck, create, delete, auth, assert, config, export, api, package, post, stream,"); print( - " zk ls, zk cp, zk rm , zk mvStandalone server example, zk mkroot, zk upconfig, zk downconfig,"); + " zk ls, zk cp, zk rm , zk mv, zk mkroot, zk upconfig, zk downconfig,"); print( " snapshot-create, snapshot-list, snapshot-delete, snapshot-export, snapshot-prepare-export"); print(""); - print(" Start Solr running in the background on port 8984:"); + print(" Start Solr on port 8984:"); print(""); printGreen(" ./solr start -p 8984"); print(""); From d2a69ead2b05109226939414dd60d32e9fec4517 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Sat, 8 Mar 2025 08:23:55 -0500 Subject: [PATCH 5/6] Simplify messaging --- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 f971bbbd913..ef76ef8969e 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -413,12 +413,12 @@ private static void printHelp() { print( " snapshot-create, snapshot-list, snapshot-delete, snapshot-export, snapshot-prepare-export"); print(""); - print(" Start Solr on port 8984:"); + print(" Start Solr on default port 8983:"); print(""); - printGreen(" ./solr start -p 8984"); + printGreen(" ./solr start"); print(""); print( - " Start Solr connecting to external Zookeeper at localhost:2181, with 1g max heap size and remote Java debug options enabled):"); + " Start Solr connecting to external Zookeeper at localhost:2181, with 1g max heap size and remote Java debug options enabled:"); print(""); printGreen( " ./solr start -m 1g -z localhost:2181 --jvm-opts \"-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=1044\""); @@ -426,7 +426,7 @@ private static void printHelp() { print( " Omit '-z localhost:2181' from the above command if you have defined ZK_HOST in solr.in.sh."); print(""); - print(" Start Solr in User Managed (aka standalone) mode:"); + print(" Start Solr in User Managed (aka Standalone) mode:"); print(""); printGreen(" ./solr start --user-managed"); print(""); From 39cdb5587235b11f80aaa4d7cc4c6482729f3718 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Sat, 8 Mar 2025 08:25:23 -0500 Subject: [PATCH 6/6] This tool no longer exists post HDFS removal. --- solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ef76ef8969e..470e491cfef 100755 --- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java @@ -411,7 +411,7 @@ private static void printHelp() { print( " zk ls, zk cp, zk rm , zk mv, zk mkroot, zk upconfig, zk downconfig,"); print( - " snapshot-create, snapshot-list, snapshot-delete, snapshot-export, snapshot-prepare-export"); + " snapshot-create, snapshot-list, snapshot-delete, snapshot-export"); print(""); print(" Start Solr on default port 8983:"); print("");