From be7d4f195f487b757774f043186707c38bfeccba Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Mon, 23 Dec 2013 17:31:50 +0000
Subject: [PATCH] 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
---
 solr/CHANGES.txt                                   |  3 +++
 .../java/org/apache/solr/core/CoreContainer.java   | 14 ++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e9e34bd49ab..f52d17f6020 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 82bb4fec617..d4748510e7a 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -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 {