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

SOLR-5585: Raise Collections API timeout to 3 minutes from one minute. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1566485 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2014-02-10 01:03:02 +00:00
parent 37fc18ef9f
commit ff542580f0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -392,6 +392,9 @@ Other Changes
* SOLR-5700: Improve error handling of remote queries (proxied requests). * SOLR-5700: Improve error handling of remote queries (proxied requests).
(Greg Chanan, Steve Davids via Mark Miller) (Greg Chanan, Steve Davids via Mark Miller)
* SOLR-5585: Raise Collections API timeout to 3 minutes from one minute.
(Mark Miller)
================== 4.6.1 ================== ================== 4.6.1 ==================
Versions of Major Components Versions of Major Components

2
solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
View File

@ -226,7 +226,7 @@ public class CollectionsHandler extends RequestHandlerBase {
handleResponse(action.toString().toLowerCase(Locale.ROOT), m, rsp); handleResponse(action.toString().toLowerCase(Locale.ROOT), m, rsp);
} }
public static long DEFAULT_ZK_TIMEOUT = 60*1000; public static long DEFAULT_ZK_TIMEOUT = 180*1000;
private void handleResponse(String operation, ZkNodeProps m, private void handleResponse(String operation, ZkNodeProps m,
SolrQueryResponse rsp) throws KeeperException, InterruptedException { SolrQueryResponse rsp) throws KeeperException, InterruptedException {