From 73170ee06c6f0f3f918d0c4b3ff85d405e388d5f Mon Sep 17 00:00:00 2001
From: Shalin Shekhar Mangar <shalin@apache.org>
Date: Fri, 28 Apr 2017 12:09:16 +0530
Subject: [PATCH] SOLR-10376: Catch and log connection loss and session expired
 exception but rethrow on all other KeeperExceptions

---
 .../apache/solr/cloud/autoscaling/OverseerTriggerThread.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
index 119613951a5..33469653864 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/OverseerTriggerThread.java
@@ -200,6 +200,8 @@ public class OverseerTriggerThread implements Runnable, Closeable {
           }
         }
       }, true);
+    } catch (KeeperException.ConnectionLossException | KeeperException.SessionExpiredException e) {
+      log.error("OverseerTriggerThread could not talk to ZooKeeper", e);
     } catch (KeeperException e) {
       log.error("Exception in OverseerTriggerThread", e);
       throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);