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:22 UTC

[2/2] lucene-solr:master: Revert "SOLR-11882: SolrMetric registries retain references to SolrCores when closed"

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() {