From ff542580f0c7bb83e1e2675c4cee6e937fd19774 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Mon, 10 Feb 2014 01:03:02 +0000 Subject: [PATCH] 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 --- solr/CHANGES.txt | 3 +++ .../java/org/apache/solr/handler/admin/CollectionsHandler.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index bff4c3187a5..e59fe9b5afc 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -392,6 +392,9 @@ Other Changes * SOLR-5700: Improve error handling of remote queries (proxied requests). (Greg Chanan, Steve Davids via Mark Miller) +* SOLR-5585: Raise Collections API timeout to 3 minutes from one minute. + (Mark Miller) + ================== 4.6.1 ================== Versions of Major Components diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java index 46cbd76974f..585f1f81364 100644 --- a/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java @@ -226,7 +226,7 @@ public class CollectionsHandler extends RequestHandlerBase { 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, SolrQueryResponse rsp) throws KeeperException, InterruptedException {