Apache Solr open-source search software
SOLR-10471: update default zk session timeout in bin/solr* scripts
Munendra S N58d13608b45d
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 03376b15a03..9c90e3299b9 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -249,6 +249,9 @@ Other Changes* SOLR-14579: Comment SolrJ 'Utils' generic map functions(Megan Carey and a lot of education from Uwe Schindler via Erick Erickson)+* SOLR-10471: Update default Zookeeper session timeout to 30s in bin/solr and bin/solr.cmd+ (Michael Braun, Markus Jelsma via Munendra S N)+================== 8.6.2 ==================Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.diff --git a/solr/bin/solr b/solr/bin/solrindex 6ef2a29b007..8037d941e25 100755--- a/solr/bin/solr+++ b/solr/bin/solr@@ -2037,7 +2037,7 @@ fiif [ "$SOLR_MODE" == 'solrcloud' ]; thenif [ -z "$ZK_CLIENT_TIMEOUT" ]; then- ZK_CLIENT_TIMEOUT="15000"+ ZK_CLIENT_TIMEOUT="30000"fiCLOUD_MODE_OPTS=("-DzkClientTimeout=$ZK_CLIENT_TIMEOUT")diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmdindex 59080908cd7..9698deb3f5c 100755--- a/solr/bin/solr.cmd+++ b/solr/bin/solr.cmd@@ -1143,7 +1143,7 @@ IF [%SOLR_LOG_PRESTART_ROTATION%] == [true] (IF NOT "%ZK_HOST%"=="" set SOLR_MODE=solrcloudIF "%SOLR_MODE%"=="solrcloud" (- IF "%ZK_CLIENT_TIMEOUT%"=="" set "ZK_CLIENT_TIMEOUT=15000"+ IF "%ZK_CLIENT_TIMEOUT%"=="" set "ZK_CLIENT_TIMEOUT=30000"set "CLOUD_MODE_OPTS=-DzkClientTimeout=!ZK_CLIENT_TIMEOUT!"diff --git a/solr/bin/solr.in.cmd b/solr/bin/solr.in.cmdindex 0c752da5232..7b5fc42b6bf 100755--- a/solr/bin/solr.in.cmd+++ b/solr/bin/solr.in.cmd@@ -56,7 +56,7 @@ REM Leave empty if not using SolrCloudREM set ZK_HOST=REM Set the ZooKeeper client timeout (for SolrCloud mode)-REM set ZK_CLIENT_TIMEOUT=15000+REM set ZK_CLIENT_TIMEOUT=30000REM By default the start script uses "localhost"; override the hostname hereREM for production SolrCloud environments to control the hostname exposed to cluster statediff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.shindex 2192aa445ab..399de1fa47d 100644--- a/solr/bin/solr.in.sh+++ b/solr/bin/solr.in.sh@@ -67,7 +67,7 @@#ZK_HOST=""# Set the ZooKeeper client timeout (for SolrCloud mode)-#ZK_CLIENT_TIMEOUT="15000"+#ZK_CLIENT_TIMEOUT="30000"# By default the start script uses "localhost"; override the hostname here# for production SolrCloud environments to control the hostname exposed to cluster state