You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by co...@apache.org on 2023/08/08 08:49:33 UTC
[solr] branch main updated: SOLR-16922: Scripts wrongly prohibit embedded zookeeper when solr port is between 55535 and 64535 (#1830)
This is an automated email from the ASF dual-hosted git repository.
colvinco 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 aa9f8675d27 SOLR-16922: Scripts wrongly prohibit embedded zookeeper when solr port is between 55535 and 64535 (#1830)
aa9f8675d27 is described below
commit aa9f8675d271dfdca721dc7153f325ff6af238ca
Author: Colvin Cowie <co...@gmail.com>
AuthorDate: Tue Aug 8 09:49:28 2023 +0100
SOLR-16922: Scripts wrongly prohibit embedded zookeeper when solr port is between 55535 and 64535 (#1830)
---
solr/CHANGES.txt | 2 ++
solr/bin/solr | 2 +-
solr/bin/solr.cmd | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ab9e7f552c4..6266da0ace7 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -99,6 +99,8 @@ Bug Fixes
* SOLR-16905: Allow access to specified "solr.allowPaths" in Security Manager (daylicron, Houston Putman)
+* SOLR-16922: Scripts wrongly prohibit embedded zookeeper when solr port is between 55535 and 64535 (Tiziano Degaetano, Colvin Cowie)
+
Dependency Upgrades
---------------------
(No changes)
diff --git a/solr/bin/solr b/solr/bin/solr
index 1a91582678d..3ff7832037a 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -1633,7 +1633,7 @@ if [ "${SOLR_MODE:-}" == 'solrcloud' ]; then
if [ -n "${ZK_HOST:-}" ]; then
CLOUD_MODE_OPTS+=("-DzkHost=$ZK_HOST")
else
- if [ $SOLR_PORT -gt 55535 ]; then
+ if [ $SOLR_PORT -gt 64535 ]; then
echo -e "\nZK_HOST is not set and Solr port is $SOLR_PORT, which would result in an invalid embedded Zookeeper port!\n"
exit 1
fi
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 71e3ab42bee..61414f807da 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1009,7 +1009,7 @@ IF "%SOLR_MODE%"=="solrcloud" (
IF NOT "%ZK_HOST%"=="" (
set "CLOUD_MODE_OPTS=!CLOUD_MODE_OPTS! -DzkHost=%ZK_HOST%"
) ELSE (
- IF %SOLR_PORT% GTR 55535 (
+ IF %SOLR_PORT% GTR 64535 (
set "SCRIPT_ERROR=ZK_HOST is not set and Solr port is %SOLR_PORT%, which would result in an invalid embedded Zookeeper port!"
goto err
)