This is an automated email from the ASF dual-hosted git repository.
janhoy 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 2c42c49 SOLR-15692 Fix parsing of -zkHost flag for the bin/solr
commands (#344)
2c42c49 is described below
commit 2c42c49877f61882153f6e067a95206a23ed6dba
Author: Jan Høydahl <[email protected]>
AuthorDate: Wed Oct 13 09:10:41 2021 +0200
SOLR-15692 Fix parsing of -zkHost flag for the bin/solr commands (#344)
---
solr/CHANGES.txt | 2 ++
solr/bin/solr | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 076b5ad..b6aa9d9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -371,6 +371,8 @@ Other Changes
* SOLR-15670: Introduce Gradle parameter to skip ref-guide tasks (Houston
Putman, Dawid Weiss)
+* SOLR-15692: Fix parsing of -zkHost flag for the bin/solr commands (janhoy)
+
Bug Fixes
---------------------
* SOLR-14546: Fix for a relatively hard to hit issue in OverseerTaskProcessor
that could lead to out of order execution
diff --git a/solr/bin/solr b/solr/bin/solr
index 2cd12a5..52a84c1 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -950,7 +950,7 @@ if [ "$SCRIPT_CMD" == "healthcheck" ]; then
HEALTHCHECK_COLLECTION="$2"
shift 2
;;
- -z|-zkhost)
+ -z|-zkhost|-zkHost)
if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
print_usage "$SCRIPT_CMD" "ZooKeeper connection string is
required when using the $1 option!"
exit 1
@@ -1292,7 +1292,7 @@ if [[ "$SCRIPT_CMD" == "zk" ]]; then
fi
shift 1
;;
- -z|-zkhost)
+ -z|-zkhost|-zkHost)
if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
print_short_zk_usage "$SCRIPT_CMD" "ZooKeeper connection string
is required when using the $1 option!"
fi
@@ -1445,7 +1445,7 @@ if [[ "$SCRIPT_CMD" == "auth" ]]; then
AUTH_PARAMS=("${AUTH_PARAMS[@]}" "$AUTH_OP")
shift
;;
- -z|-zkhost|zkHost)
+ -z|-zkhost|-zkHost)
ZK_HOST="$2"
AUTH_PARAMS=("${AUTH_PARAMS[@]}" "-zkHost" "$ZK_HOST")
shift 2
@@ -1713,7 +1713,7 @@ if [ $# -gt 0 ]; then
PASS_TO_RUN_EXAMPLE+=" -p $SOLR_PORT"
shift 2
;;
- -z|-zkhost)
+ -z|-zkhost|-zkHost)
if [[ -z "$2" || "${2:0:1}" == "-" ]]; then
print_usage "$SCRIPT_CMD" "Zookeeper connection string is
required when using the $1 option!"
exit 1
