Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12047: Increase checkStateInZk timeout

This commit is contained in:
Cao Manh Dat 2018-03-06 08:51:38 +07:00
parent c1a44251fe
commit 4bdc99a465
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -359,6 +359,8 @@ Other Changes
* SOLR-11957: Increase MaxFileSize=32MB and MaxBackupIndex=10 for RollingFileAppender in log4j.properties * SOLR-11957: Increase MaxFileSize=32MB and MaxBackupIndex=10 for RollingFileAppender in log4j.properties
(Varun Thacker, shalin) (Varun Thacker, shalin)
* SOLR-12047: Increase checkStateInZk timeout (Cao Manh Dat, Varun Thacker)
================== 7.2.1 ================== ================== 7.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

2
solr/core/src/java/org/apache/solr/cloud/ZkController.java
View File

@ -1704,7 +1704,7 @@ public class ZkController {
AtomicReference<String> errorMessage = new AtomicReference<>(); AtomicReference<String> errorMessage = new AtomicReference<>();
AtomicReference<DocCollection> collectionState = new AtomicReference<>(); AtomicReference<DocCollection> collectionState = new AtomicReference<>();
try { try {
zkStateReader.waitForState(cd.getCollectionName(), 3, TimeUnit.SECONDS, (n, c) -> { zkStateReader.waitForState(cd.getCollectionName(), 10, TimeUnit.SECONDS, (n, c) -> {
collectionState.set(c); collectionState.set(c);
if (c == null) if (c == null)
return false; return false;