You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/12/23 18:31:50 UTC
svn commit: r1553157 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/CoreContainer.java
Author: markrmiller
Date: Mon Dec 23 17:31:50 2013
New Revision: 1553157
URL: http://svn.apache.org/r1553157
Log:
SOLR-5574: CoreContainer shutdown publishes all nodes as down and waits to see that and then again publishes all nodes as down.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1553157&r1=1553156&r2=1553157&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Dec 23 17:31:50 2013
@@ -265,6 +265,9 @@ Other Changes
* SOLR-5565: Raise default ZooKeeper session timeout to 30 seconds from 15
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 ==================
Versions of Major Components
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1553157&r1=1553156&r2=1553157&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Mon Dec 23 17:31:50 2013
@@ -357,21 +357,11 @@ public class CoreContainer {
log.info("Shutting down CoreContainer instance="
+ 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;
-
+
if (isZooKeeperAware()) {
- zkSys.publishCoresAsDown(solrCores.getCores());
cancelCoreRecoveries();
+ zkSys.publishCoresAsDown(solrCores.getCores());
}
try {