Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17674: Refresh bin/solr instructions to down play SolrCloud and introduce --user-managed example. (#3190)

Eric Pugh7422ad65b521
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");