lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1553158 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/core/ solr/core/src/java/org/apache/solr/core/CoreContainer.java
Date Mon, 23 Dec 2013 17:32:52 GMT
Author: markrmiller
Date: Mon Dec 23 17:32:51 2013
New Revision: 1553158

URL: http://svn.apache.org/r1553158
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/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/CHANGES.txt   (contents, props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java

Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1553158&r1=1553157&r2=1553158&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Mon Dec 23 17:32:51 2013
@@ -229,6 +229,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/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1553158&r1=1553157&r2=1553158&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java
(original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Mon Dec 23 17:32:51 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 {



Mime
View raw message