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/02/08 22:44:40 UTC
svn commit: r1444249 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/CoreContainer.java
Author: markrmiller
Date: Fri Feb 8 21:44:40 2013
New Revision: 1444249
URL: http://svn.apache.org/r1444249
Log:
SOLR-4421: On CoreContainer shutdown, all SolrCores should publish their state 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=1444249&r1=1444248&r2=1444249&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Feb 8 21:44:40 2013
@@ -146,6 +146,9 @@ Other Changes
* SOLR-4384: Make post.jar report timing information (Upayavira via janhoy)
+* SOLR-4421: On CoreContainer shutdown, all SolrCores should publish their
+ state as DOWN. (Mark Miller)
+
================== 4.1.0 ==================
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=1444249&r1=1444248&r2=1444249&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 Fri Feb 8 21:44:40 2013
@@ -743,6 +743,7 @@ public class CoreContainer
isShutDown = true;
if (isZooKeeperAware()) {
+ publishCoresAsDown();
cancelCoreRecoveries();
}
try {
@@ -783,6 +784,20 @@ public class CoreContainer
}
}
+ private void publishCoresAsDown() {
+ synchronized (cores) {
+ for (SolrCore core : cores.values()) {
+ try {
+ zkController.publish(core.getCoreDescriptor(), ZkStateReader.DOWN);
+ } catch (KeeperException e) {
+ log.error("", e);
+ } catch (InterruptedException e) {
+ log.error("", e);
+ }
+ }
+ }
+ }
+
public void cancelCoreRecoveries() {
ArrayList<SolrCoreState> coreStates = new ArrayList<SolrCoreState>();
synchronized (cores) {