You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/02/01 17:31:41 UTC
[1/2] lucene-solr:branch_7x: Revert "SOLR-11882: SolrMetric
registries retain references to SolrCores when closed"
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 88bdfbb52 -> b586dca89
Revert "SOLR-11882: SolrMetric registries retain references to SolrCores when closed"
This reverts commit a729fc83311a2f6426664d098d2a5920e2b62852.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/83696042
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/83696042
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/83696042
Branch: refs/heads/branch_7x
Commit: 83696042649e5c7460c47d0ca121c46a58d2fa54
Parents: 88bdfbb
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Feb 1 18:14:55 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Feb 1 18:14:55 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/solr/metrics/SolrCoreMetricManager.java | 7 -------
1 file changed, 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/83696042/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java b/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
index 7dcd1e1..74c9596 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
@@ -20,7 +20,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
-import com.codahale.metrics.Gauge;
import com.codahale.metrics.MetricRegistry;
import org.apache.solr.cloud.CloudDescriptor;
import org.apache.solr.common.util.Utils;
@@ -151,12 +150,6 @@ public class SolrCoreMetricManager implements Closeable {
if (getLeaderRegistryName() != null) {
metricManager.closeReporters(getLeaderRegistryName(), tag);
}
- MetricRegistry metricRegistry = getRegistry();
- metricRegistry.getGauges().forEach((k, v) -> {
- Object val = v.getValue();
- metricRegistry.remove(k);
- metricRegistry.register(k, (Gauge)() -> val);
- });
}
public SolrCore getCore() {
[2/2] lucene-solr:branch_7x: Revert "SOLR-11882: SolrMetric
registries retain references to SolrCores when closed"
Posted by ab...@apache.org.
Revert "SOLR-11882: SolrMetric registries retain references to SolrCores when closed"
This reverts commit 2feb3e794a03e07fa1eee34188d667f24d357db5.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b586dca8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b586dca8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b586dca8
Branch: refs/heads/branch_7x
Commit: b586dca89ff0b7c365dcbb3e1e403adf477790b1
Parents: 8369604
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Feb 1 18:15:26 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Feb 1 18:15:26 2018 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b586dca8/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index eefbd8d..be7b5c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -153,9 +153,6 @@ Bug Fixes
* SOLR-11895: Logging Screen in the Admin UI will now show "No Events available" when there are no events to show.
Also, the spinner icon is removed to prevent users thinking the page has hung. (Cassandra Targett, Shawn Heisey)
-* SOLR-11882: SolrMetric registries retain references to SolrCores when closed.
- (Andrzej Bialecki, Erick Erickson)
-
* SOLR-10525: Stacked recovery requests do no cancel an in progress recovery first. (Mike Drob via Cao Manh Dat)
* SOLR-11873: Use time based expiration cache in all necessary places in HdfsDirectoryFactory. (Mihaly Toth via Mark Miller)