mirror of https://github.com/apache/lucene.git
SOLR-4899: When reconnecting after ZooKeeper expiration, we need to be willing to wait forever, not just for 30 seconds.
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1491449 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
84b3a0e40b
commit
5c052874e8
|
@ -128,6 +128,9 @@ Bug Fixes
|
|||
* SOLR-4805: SolreCore#reload should not call preRegister and publish a DOWN state to
|
||||
ZooKeeper. (Mark Miller, Jared Rodriguez)
|
||||
|
||||
* SOLR-4899: When reconnecting after ZooKeeper expiration, we need to be willing to wait
|
||||
forever, not just for 30 seconds. (Mark Miller)
|
||||
|
||||
Other Changes
|
||||
----------------------
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ class ConnectionManager implements Watcher {
|
|||
// if keeper does not replace oldKeeper we must be sure to close it
|
||||
synchronized (connectionUpdateLock) {
|
||||
try {
|
||||
waitForConnected(SolrZkClient.DEFAULT_CLIENT_CONNECT_TIMEOUT);
|
||||
waitForConnected(Long.MAX_VALUE);
|
||||
} catch (Exception e1) {
|
||||
closeKeeper(keeper);
|
||||
throw new RuntimeException(e1);
|
||||
|
|
Loading…
Reference in New Issue