Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16922: Scripts wrongly prohibit embedded zookeeper when solr port is between 55535 and 64535 (#1830)

Colvin Cowieaa9f8675d271
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
)