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

SOLR-5574: CoreContainer shutdown publishes all nodes as down and waits to see that and then again publishes all nodes as down. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1553157 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2013-12-23 17:31:50 +00:00
parent 97d3e2d546
commit be7d4f195f
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -265,6 +265,9 @@ Other Changes
* SOLR-5565: Raise default ZooKeeper session timeout to 30 seconds from 15 * SOLR-5565: Raise default ZooKeeper session timeout to 30 seconds from 15
seconds. (Mark Miller) seconds. (Mark Miller)
* SOLR-5574: CoreContainer shutdown publishes all nodes as down and waits to
see that and then again publishes all nodes as down. (Mark Miller)
================== 4.6.1 ================== ================== 4.6.1 ==================
Versions of Major Components Versions of Major Components

14
solr/core/src/java/org/apache/solr/core/CoreContainer.java
View File

@ -357,21 +357,11 @@ public class CoreContainer {
log.info("Shutting down CoreContainer instance=" log.info("Shutting down CoreContainer instance="
+ System.identityHashCode(this)); + System.identityHashCode(this));
if (isZooKeeperAware()) {
try {
zkSys.getZkController().publishAndWaitForDownStates();
} catch (KeeperException e) {
log.error("", e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
log.warn("", e);
}
}
isShutDown = true; isShutDown = true;
if (isZooKeeperAware()) { if (isZooKeeperAware()) {
zkSys.publishCoresAsDown(solrCores.getCores());
cancelCoreRecoveries(); cancelCoreRecoveries();
zkSys.publishCoresAsDown(solrCores.getCores());
} }
try { try {