You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/03/06 01:51:49 UTC
lucene-solr:master: SOLR-12047: Increase checkStateInZk timeout
Repository: lucene-solr
Updated Branches:
refs/heads/master c1a44251f -> 4bdc99a46
SOLR-12047: Increase checkStateInZk timeout
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4bdc99a4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4bdc99a4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4bdc99a4
Branch: refs/heads/master
Commit: 4bdc99a465f830c5fe71abc2833327b9c27b221c
Parents: c1a4425
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Mar 6 08:51:38 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Mar 6 08:51:38 2018 +0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/cloud/ZkController.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4bdc99a4/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index f9ca9e6..f398c0b 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -359,6 +359,8 @@ Other Changes
* SOLR-11957: Increase MaxFileSize=32MB and MaxBackupIndex=10 for RollingFileAppender in log4j.properties
(Varun Thacker, shalin)
+* SOLR-12047: Increase checkStateInZk timeout (Cao Manh Dat, Varun Thacker)
+
================== 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/4bdc99a4/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index a159db5..9d9d2bb 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -1704,7 +1704,7 @@ public class ZkController {
AtomicReference<String> errorMessage = new AtomicReference<>();
AtomicReference<DocCollection> collectionState = new AtomicReference<>();
try {
- zkStateReader.waitForState(cd.getCollectionName(), 3, TimeUnit.SECONDS, (n, c) -> {
+ zkStateReader.waitForState(cd.getCollectionName(), 10, TimeUnit.SECONDS, (n, c) -> {
collectionState.set(c);
if (c == null)
return false;