From f7aed2876076aa489bc227d6d8d2e8c6ac96d8a0 Mon Sep 17 00:00:00 2001
From: Christine Poerschke <cpoerschke@apache.org>
Date: Tue, 17 Jul 2018 17:09:07 +0100
Subject: [PATCH] SOLR-12464: Reduce Overseer.close() logging (for non-Overseer
 leaders)

---
 solr/CHANGES.txt                                     |  2 ++
 .../src/java/org/apache/solr/cloud/Overseer.java     | 12 +++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 425a3dbb818..9991e3a7544 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -183,6 +183,8 @@ Other Changes
 
 * SOLR-12551: Upgrade to Tika 1.18 (Tim Allison via Erick Erickson)
 
+* SOLR-12464: Reduce Overseer.close() logging (for non-Overseer leaders) (Christine Poerschke)
+
 ==================  7.4.0 ==================
 
 Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 2c666994e1e..0a991ffd454 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -544,7 +544,9 @@ public class Overseer implements SolrCloseable {
     updaterThread.start();
     ccThread.start();
     triggerThread.start();
-    assert ObjectReleaseTracker.track(this);
+    if (this.id != null) {
+      assert ObjectReleaseTracker.track(this);
+    }
   }
 
   public Stats getStats() {
@@ -584,11 +586,15 @@ public class Overseer implements SolrCloseable {
   
   public synchronized void close() {
     if (closed) return;
-    log.info("Overseer (id=" + id + ") closing");
+    if (this.id != null) {
+      log.info("Overseer (id=" + id + ") closing");
+    }
     
     doClose();
     this.closed = true;
-    assert ObjectReleaseTracker.release(this);
+    if (this.id != null) {
+      assert ObjectReleaseTracker.release(this);
+    }
   }
 
   @Override