You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2018/01/29 03:44:17 UTC
[1/3] lucene-solr:master: SOLR-11882: SolrMetric registries retain
references to SolrCores when closed
Repository: lucene-solr
Updated Branches:
refs/heads/master d15ab2f49 -> d85a1666a
SOLR-11882: SolrMetric registries retain references to SolrCores when closed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f0509c19
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f0509c19
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f0509c19
Branch: refs/heads/master
Commit: f0509c19c16ded1557f8d7168acb0b7faf926ab7
Parents: 183835e
Author: Erick <er...@apache.org>
Authored: Tue Jan 23 17:39:02 2018 -0800
Committer: Erick <er...@apache.org>
Committed: Tue Jan 23 17:39:02 2018 -0800
----------------------------------------------------------------------
.../java/org/apache/solr/metrics/SolrCoreMetricManager.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f0509c19/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 74c9596..7dcd1e1 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrCoreMetricManager.java
@@ -20,6 +20,7 @@ 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;
@@ -150,6 +151,12 @@ 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/3] lucene-solr:master: SOLR-11882: SolrMetric registries retain
references to SolrCores when closed
Posted by er...@apache.org.
SOLR-11882: SolrMetric registries retain references to SolrCores when closed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c724845f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c724845f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c724845f
Branch: refs/heads/master
Commit: c724845fabcdbffe15ad78f5335c77cae0900194
Parents: f0509c1
Author: Erick <er...@apache.org>
Authored: Sun Jan 28 19:39:24 2018 -0800
Committer: Erick <er...@apache.org>
Committed: Sun Jan 28 19:39:24 2018 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c724845f/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0291a5f..b9226b3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -122,6 +122,9 @@ Bug Fixes
* SOLR-11794: PULL replicas stop replicating after collection RELOAD (Samuel Tatipamula, Tomás Fernández Löbbe)
+* SOLR-11882: SolrMetric registries retain references to SolrCores when closed.
+ (Andrzej Bialecki, Erick Erickson)
+
Optimizations
----------------------
[3/3] lucene-solr:master: SOLR-11882: SolrMetric registries retain
references to SolrCores when closed
Posted by er...@apache.org.
SOLR-11882: SolrMetric registries retain references to SolrCores when closed
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d85a1666
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d85a1666
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d85a1666
Branch: refs/heads/master
Commit: d85a1666a18423eeeda83ca89ce4ab959ce39066
Parents: d15ab2f c724845
Author: Erick <er...@apache.org>
Authored: Sun Jan 28 19:42:58 2018 -0800
Committer: Erick <er...@apache.org>
Committed: Sun Jan 28 19:42:58 2018 -0800
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../java/org/apache/solr/metrics/SolrCoreMetricManager.java | 7 +++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d85a1666/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index 5efc3d2,b9226b3..2943f6c
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -132,11 -122,9 +132,14 @@@ Bug Fixe
* SOLR-11794: PULL replicas stop replicating after collection RELOAD (Samuel Tatipamula, Tomás Fernández Löbbe)
+* SOLR-11714: AddReplicaSuggester / ComputePlanAction infinite loop. (ab)
+
+* 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)
+
Optimizations
----------------------