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

[co...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch_9x by this push:
     new 7277949e2ad SOLR-16922: Scripts wrongly prohibit embedded zookeeper when solr port is between 55535 and 64535 (#1830)
7277949e2ad is described below

commit 7277949e2adfb06648638d40c01089173061fd58
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 8c137451704..c9b78c78b5a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -40,6 +40,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 32b66cb0aa2..b118018261c 100644
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -2109,7 +2109,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 c6a64c5d07a..8b5cd636f05 100755
--- a/solr/bin/solr.cmd
+++ b/solr/bin/solr.cmd
@@ -1190,7 +1190,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
     )