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 2018/12/01 00:13:59 UTC
lucene-solr:branch_7x: SOLR-13030: Close MetricsHistoryHandler inline.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 5763d8b19 -> 2f6bdb594
SOLR-13030: Close MetricsHistoryHandler inline.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2f6bdb59
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2f6bdb59
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2f6bdb59
Branch: refs/heads/branch_7x
Commit: 2f6bdb5940ba34386b60ab5868df98eb8cf94b2a
Parents: 5763d8b
Author: markrmiller <ma...@apache.org>
Authored: Fri Nov 30 18:13:26 2018 -0600
Committer: markrmiller <ma...@apache.org>
Committed: Fri Nov 30 18:13:53 2018 -0600
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2f6bdb59/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
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 a56a1b5..13d197b 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -890,12 +890,8 @@ public class CoreContainer {
}));
if (metricsHistoryHandler != null) {
- customThreadPool.submit(() -> Collections.singleton(metricsHistoryHandler).parallelStream().forEach(c -> {
- IOUtils.closeQuietly(c);
- }));
- customThreadPool.submit(() -> Collections.singleton(metricsHistoryHandler.getSolrClient()).parallelStream().forEach(c -> {
- IOUtils.closeQuietly(c);
- }));
+ metricsHistoryHandler.close();
+ IOUtils.closeQuietly(metricsHistoryHandler.getSolrClient());
}
if (metricManager != null) {