[lucene-solr] 01/03: @1168 Logging cleanup.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 8cce4cf7508a9ced8f5569c3af5cbba379cf7712
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Nov 11 16:09:55 2020 -0600

    @1168 Logging cleanup.
---
 .../src/java/org/apache/solr/cloud/Overseer.java   | 57 ----------------------
 .../cloud/api/collections/DeleteReplicaCmd.java    |  6 +--
 2 files changed, 3 insertions(+), 60 deletions(-)

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 1b31274..39a7d1b 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -732,63 +732,6 @@ public class Overseer implements SolrCloseable {
 
   }
 
-  // nocommit use
-  private static class OverseerWatcher implements Watcher, Closeable {
-
-    private final CoreContainer cc;
-    private final ZkController zkController;
-    private final String path = Overseer.OVERSEER_ELECT + "/leader";
-    private final Overseer overseer;
-
-    public OverseerWatcher(CoreContainer cc) {
-      this.cc = cc;
-      this.zkController = cc.getZkController();
-      this.overseer = zkController.getOverseer();
-    }
-
-    @Override
-    public void process(WatchedEvent event) {
-      try {
-        if (log.isDebugEnabled()) {
-          log.debug("set watch on leader znode");
-        }
-        zkController.getZkClient().exists(path, new Watcher() {
-
-          @Override
-          public void process(WatchedEvent event) {
-            if (Event.EventType.None.equals(event.getType())) {
-              return;
-            }
-
-            log.info("Overseer leader has changed, closing ...");
-            overseer.close();
-
-          }}, true);
-      } catch (KeeperException.SessionExpiredException e) {
-        log.warn("ZooKeeper session expired");
-        overseer.doClose();
-        return;
-      } catch (InterruptedException | AlreadyClosedException e) {
-        log.info("Already closed");
-        overseer.doClose();
-        return;
-      } catch (Exception e) {
-        log.error("Unexpected error in Overseer state update loop", e);
-        overseer.doClose();
-        throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
-      }
-    }
-
-    @Override
-    public void close() throws IOException {
-      try {
-        zkController.getZkClient().getSolrZooKeeper().removeWatches(path, this, WatcherType.Data, true);
-      } catch (Exception e) {
-        log.info("", e.getMessage());
-      }
-    }
-  }
-
   private static abstract class QueueWatcher implements Watcher, Closeable {
 
     protected final CoreContainer cc;
diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java
index 91634d7..1be60ef 100644
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DeleteReplicaCmd.java
@@ -294,7 +294,7 @@ public class DeleteReplicaCmd implements Cmd {
       replicasToBeRemoved.add(replica.getName());
       count --;
     }
-    log.info("Found replicas to be removed {}", replicasToBeRemoved);
+    if (log.isDebugEnabled()) log.debug("Found replicas to be removed {}", replicasToBeRemoved);
     return replicasToBeRemoved;
   }
 
@@ -350,9 +350,9 @@ public class DeleteReplicaCmd implements Cmd {
     rep.getProperties().put("collection", replica.getCollection());
     rep.getProperties().put(ZkStateReader.NODE_NAME_PROP, replica.getNodeName());
 
-    log.info("Before slice remove replica {} {}", rep, clusterState);
+    if (log.isDebugEnabled()) log.debug("Before slice remove replica {} {}", rep, clusterState);
     clusterState = new SliceMutator(ocmh.cloudManager).removeReplica(clusterState, rep);
-    log.info("After slice remove replica {} {}", rep, clusterState);
+    if (log.isDebugEnabled()) log.debug("After slice remove replica {} {}", rep, clusterState);
     boolean isLive = false;
 
     if (!onlyUpdateState) {