You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/03/10 00:31:14 UTC

lucene-solr:branch_7x: SOLR-12067: Increase autoAddReplicas default 30 second wait time to 120 seconds

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x 4abdb2466 -> 16c57501a


SOLR-12067: Increase autoAddReplicas default 30 second wait time to 120 seconds

(cherry picked from commit f0d46ea)


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/16c57501
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/16c57501
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/16c57501

Branch: refs/heads/branch_7x
Commit: 16c57501a96aa8ecb77e88f81f044df8dc0add60
Parents: 4abdb24
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sat Mar 10 05:59:16 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sat Mar 10 06:01:06 2018 +0530

----------------------------------------------------------------------
 solr/CHANGES.txt                                         | 7 +++++++
 solr/core/src/java/org/apache/solr/core/CloudConfig.java | 3 +--
 2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16c57501/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b33c30f..ee034ee 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -68,6 +68,10 @@ Upgrade Notes
 
 * SOLR-11957: The default Solr log file size and number of backups is raised to 32MB and 10 respectively
 
+* SOLR-12067: The default value of `autoReplicaFailoverWaitAfterExpiration` has been increased to 120 seconds
+  from the earlier default of 30 seconds. This affects how soon Solr adds new replicas to replace the replicas
+  on nodes which have either crashed or shutdown.
+
 New Features
 ----------------------
 * SOLR-11285: Simulation framework for autoscaling. (ab)
@@ -357,6 +361,9 @@ Other Changes
 
 * SOLR-12051: Election timeout when no replicas are qualified to become leader (Cao Manh Dat)
 
+* SOLR-12067: Increase autoAddReplicas default 30 second wait time to 120 seconds.
+  (Varun Thacker, Mark Miller via shalin)
+
 ==================  7.2.1 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16c57501/solr/core/src/java/org/apache/solr/core/CloudConfig.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/core/CloudConfig.java b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
index b971a0b..6248b45 100644
--- a/solr/core/src/java/org/apache/solr/core/CloudConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/CloudConfig.java
@@ -130,8 +130,7 @@ public class CloudConfig {
     private static final int DEFAULT_CREATE_COLLECTION_ACTIVE_WAIT = 30;  // 30 seconds
     private static final boolean DEFAULT_CREATE_COLLECTION_CHECK_LEADER_ACTIVE = false; 
  
-    // TODO: tune defaults
-    private static final int DEFAULT_AUTO_REPLICA_FAILOVER_WAIT_AFTER_EXPIRATION = 30000;
+    private static final int DEFAULT_AUTO_REPLICA_FAILOVER_WAIT_AFTER_EXPIRATION = 120000;
 
     private String zkHost = System.getProperty("zkHost");
     private int zkClientTimeout = Integer.getInteger("zkClientTimeout", DEFAULT_ZK_CLIENT_TIMEOUT);