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 2020/07/15 04:16:57 UTC
[lucene-solr] branch reference_impl updated: #172 - Hit more leaks.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/reference_impl by this push:
new fe1ff0c #172 - Hit more leaks.
fe1ff0c is described below
commit fe1ff0c93b73c82e1a04491b71c3e4e8e4e3a30c
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 14 23:16:40 2020 -0500
#172 - Hit more leaks.
---
solr/core/src/java/org/apache/solr/cloud/Overseer.java | 7 +++++++
solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java | 2 +-
solr/solrj/src/java/org/apache/solr/common/ParWork.java | 2 +-
3 files changed, 9 insertions(+), 2 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 19077a1..9333bca 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -616,8 +616,15 @@ public class Overseer implements SolrCloseable {
MDCLoggingContext.setNode(zkController == null ?
null :
zkController.getNodeName());
+
+ if (getCoreContainer().isShutDown()) {
+ if (log.isDebugEnabled()) log.debug("Already closed, exiting");
+ }
+
this.id = id;
this.context = context;
+
+
closed = false;
try {
diff --git a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
index 6263efd..73d053e 100644
--- a/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
+++ b/solr/core/src/java/org/apache/solr/cloud/SyncStrategy.java
@@ -85,7 +85,7 @@ public class SyncStrategy implements Closeable {
return PeerSync.PeerSyncResult.success();
}
- if (isClosed) {
+ if (isClosed || zkController.getCoreContainer().isShutDown()) {
log.warn("Closed, skipping sync up.");
return PeerSync.PeerSyncResult.failure();
}
diff --git a/solr/solrj/src/java/org/apache/solr/common/ParWork.java b/solr/solrj/src/java/org/apache/solr/common/ParWork.java
index e9c23d1..bc105d3 100644
--- a/solr/solrj/src/java/org/apache/solr/common/ParWork.java
+++ b/solr/solrj/src/java/org/apache/solr/common/ParWork.java
@@ -512,7 +512,7 @@ public class ParWork implements Closeable {
}
} catch (InterruptedException e1) {
- log.error(WORK_WAS_INTERRUPTED, e1);
+ log.warn(WORK_WAS_INTERRUPTED, e1);
Thread.currentThread().interrupt();
}
}