[lucene-solr] branch master updated: SOLR-10471: update default zk session timeout in bin/solr* scripts

[mu...@apache.org]

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

munendrasn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/master by this push:
     new 58d1360  SOLR-10471: update default zk session timeout in bin/solr* scripts
58d1360 is described below

commit 58d13608b45d5e412fa194d1b1a8a4ef43c0cf6a
Author: Munendra S N <mu...@apache.org>
AuthorDate: Tue Sep 15 19:32:51 2020 +0530

    SOLR-10471: update default zk session timeout in bin/solr* scripts
    
    * zkClientTimeout value is already set to 30s in solr.xml but
      same update was missing from bin/solr* script
---
 solr/CHANGES.txt     | 3 +++
 solr/bin/solr        | 2 +-
 solr/bin/solr.cmd    | 2 +-
 solr/bin/solr.in.cmd | 2 +-
 solr/bin/solr.in.sh  | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 03376b1..9c90e32 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/solr
index 6ef2a29..8037d94 100755
--- a/solr/bin/solr
+++ b/solr/bin/solr
@@ -2037,7 +2037,7 @@ fi
 
 if [ "$SOLR_MODE" == 'solrcloud' ]; then
   if [ -z "$ZK_CLIENT_TIMEOUT" ]; then
-    ZK_CLIENT_TIMEOUT="15000"
+    ZK_CLIENT_TIMEOUT="30000"
   fi
 
   CLOUD_MODE_OPTS=("-DzkClientTimeout=$ZK_CLIENT_TIMEOUT")
diff --git a/solr/bin/solr.cmd b/solr/bin/solr.cmd
index 5908090..9698deb 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=solrcloud
 
 IF "%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.cmd
index 0c752da..7b5fc42 100755
--- a/solr/bin/solr.in.cmd
+++ b/solr/bin/solr.in.cmd
@@ -56,7 +56,7 @@ REM Leave empty if not using SolrCloud
 REM set ZK_HOST=
 
 REM Set the ZooKeeper client timeout (for SolrCloud mode)
-REM set ZK_CLIENT_TIMEOUT=15000
+REM set ZK_CLIENT_TIMEOUT=30000
 
 REM By default the start script uses "localhost"; override the hostname here
 REM for production SolrCloud environments to control the hostname exposed to cluster state
diff --git a/solr/bin/solr.in.sh b/solr/bin/solr.in.sh
index 2192aa4..399de1f 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