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:14:21 UTC
[1/2] lucene-solr:master: Revert "SOLR-11882: SolrMetric registries
retain references to SolrCores when closed"
Repository: lucene-solr
Updated Branches:
refs/heads/master f0854ce11 -> b0b963c68
Revert "SOLR-11882: SolrMetric registries retain references to SolrCores when closed"
This reverts commit c724845fabcdbffe15ad78f5335c77cae0900194.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b0b963c6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b0b963c6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b0b963c6
Branch: refs/heads/master
Commit: b0b963c68e04a249b87d5b3ab70ade52d19d85ee
Parents: 8418081
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Feb 1 17:36:07 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Feb 1 18:14:13 2018 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b0b963c6/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 539bf24..223e871 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -173,9 +173,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)
[2/2] lucene-solr:master: 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 f0509c19c16ded1557f8d7168acb0b7faf926ab7.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8418081c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8418081c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8418081c
Branch: refs/heads/master
Commit: 8418081c4ae5bfe752938c1ae6db9cf5063c8e7f
Parents: f0854ce
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Thu Feb 1 17:35:03 2018 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Thu Feb 1 18:14:13 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/8418081c/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() {