[solr] branch jira/solr16636_test updated: removed logging. added more debugging

[noble]

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

noble pushed a commit to branch jira/solr16636_test
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/jira/solr16636_test by this 
push:
     new 12a959a237f removed logging. added more debugging
12a959a237f is described below

commit 12a959a237f952f037403310784b4af59fc49b2a
Author: Noble Paul <noble.p...@gmail.com>
AuthorDate: Tue Feb 21 22:54:37 2023 +1100

    removed logging. added more debugging
---
 .../src/java/org/apache/solr/core/CoreContainer.java  |  2 --
 .../org/apache/solr/common/cloud/ZkStateReader.java   | 19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

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 5598d806a30..21da510c60d 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -131,7 +131,6 @@ import org.apache.solr.handler.designer.SchemaDesignerAPI;
 import org.apache.solr.jersey.InjectionFactories;
 import org.apache.solr.jersey.JerseyAppHandlerCache;
 import org.apache.solr.logging.LogWatcher;
-import org.apache.solr.logging.LoggerInfo;
 import org.apache.solr.logging.MDCLoggingContext;
 import org.apache.solr.metrics.SolrCoreMetricManager;
 import org.apache.solr.metrics.SolrMetricManager;
@@ -741,7 +740,6 @@ public class CoreContainer {
     }
 
     logging = LogWatcher.newRegisteredLogWatcher(cfg.getLogWatcherConfig(), 
loader);
-    logging.setLogLevel(LoggerInfo.ROOT_NAME, "DEBUG");
 
     ClusterEventProducerFactory clusterEventProducerFactory = new 
ClusterEventProducerFactory(this);
     clusterEventProducer = clusterEventProducerFactory;
diff --git 
a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java 
b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index f9d3398948b..c9dd8dd6aaa 100644
--- 
a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ 
b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1700,6 +1700,9 @@ public class ZkStateReader implements SolrCloseable {
     Stat stat = null;
     try {
       stat = zkClient.exists(collectionPath, null, false);
+    } catch (InterruptedException ie) {
+      Thread.currentThread().interrupt();
+      return null;
     } catch (Exception e) {
       log.warn("unexpected exception: ",e);
       return null;
@@ -1905,7 +1908,13 @@ public class ZkStateReader implements SolrCloseable {
     if (closed) {
       throw new AlreadyClosedException();
     }
-    DocCollection coll = fetchCachedCollection(collection);
+    DocCollection coll = null;
+    try {
+      coll = fetchCachedCollection(collection);
+    } catch (Exception e) {
+      log.warn("fetch threw exception",e);
+      //do not do anything
+    }
     if (coll != null && predicate.matches(liveNodes, coll)) return;
 
     final CountDownLatch latch = new CountDownLatch(1);
@@ -1960,7 +1969,13 @@ public class ZkStateReader implements SolrCloseable {
     if (closed) {
       throw new AlreadyClosedException();
     }
-    DocCollection coll = fetchCachedCollection(collection);
+    DocCollection coll = null;
+    try {
+      coll = fetchCachedCollection(collection);
+    } catch (Exception e) {
+      log.warn("fetch threw exception",e);
+      //do not do anything
+    }
     if (coll != null && predicate.test(coll)) return coll;
     final CountDownLatch latch = new CountDownLatch(1);
     waitLatches.add(latch);