You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2021/03/09 19:05:14 UTC
[lucene-solr] 06/09: @1430 Extra stop on watch and debug.
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 c67186b8cb12139f72050457bba5d5a3556ce9e9
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Mar 6 17:07:46 2021 -0600
@1430 Extra stop on watch and debug.
Took 19 minutes
---
solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java | 5 +++--
solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index c138b24..5051b18 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -123,7 +123,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
-import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicReference;
@@ -265,7 +264,9 @@ public class HttpSolrCall {
core = cores.getCore(origCorename);
}
- if (log.isDebugEnabled()) log.debug("tried to get core by name {} got {}, existing cores {} found={}", origCorename, core, cores.getAllCoreNames(), core != null);
+ if (core == null && log.isDebugEnabled()) {
+ log.debug("tried to get core by name {} got {}, existing cores {} found={}", origCorename, core, cores.getAllCoreNames(), core != null);
+ }
if (core != null) {
if (idx2 > 0) {
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 1710aa3..d65c10f 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1624,7 +1624,7 @@ public class ZkStateReader implements SolrCloseable, Replica.NodeNameToBaseUrl {
@Override
public void close() throws IOException {
this.closed = true;
- IOUtils.closeQuietly(stateUpdateWatcher);
+ // IOUtils.closeQuietly(stateUpdateWatcher);
// SolrZooKeeper zk = zkClient.getSolrZooKeeper();
// if (zk != null) {
// try {