This is an automated email from the ASF dual-hosted git repository.

epugh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/main by this push:
     new 7422ad65b52 SOLR-17674: Refresh bin/solr instructions to down play 
SolrCloud and introduce --user-managed example. (#3190)
7422ad65b52 is described below

commit 7422ad65b5218b3da2d7112a37b84040067322a6
Author: Eric Pugh <[email protected]>
AuthorDate: Thu Apr 3 12:19:49 2025 +0200

    SOLR-17674: Refresh bin/solr instructions to down play SolrCloud and 
introduce --user-managed example. (#3190)
    
    * Refresh the start examples.
    * Clarify default start command is in SolrCloud mode.
    * make sure to introduce how to run User Managed mode.   Reference 
standalone since most folks know it as that.
---
 solr/bin/solr                                       |  2 +-
 solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/solr/bin/solr b/solr/bin/solr
index e085b6100dd..3466cdc6b23 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -716,7 +716,7 @@ if [ $# -gt 0 ]; then
             if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
               print_usage "$SCRIPT_CMD" "Data home directory is required when 
using the $1 option!"
               exit 1
-            fi        
+            fi
             SOLR_DATA_HOME="$2"
             shift 2
         ;;
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 eda67918864..0b8648bbf22 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -405,14 +405,14 @@ public class SolrCLI implements CLIO {
     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("  Standalone server example (start Solr running in the background 
on port 8984):");
+    print("  Start Solr in SolrCloud mode on default port 8983:");
     print("");
-    printGreen("    ./solr start -p 8984");
+    printGreen("    ./solr start");
     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 in SolrCloud mode using an 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\"");
@@ -420,6 +420,10 @@ public class SolrCLI implements CLIO {
     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");

Reply via email to