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/09/17 13:44:26 UTC
lucene-solr:branch_7x: SOLR-12765: Incorrect format of JMX cache
stats.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 013a9059b -> 922e01624
SOLR-12765: Incorrect format of JMX cache stats.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/922e0162
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/922e0162
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/922e0162
Branch: refs/heads/branch_7x
Commit: 922e016245f6dde5f87a908ee0555ef3df60c8ac
Parents: 013a905
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Sep 17 14:40:36 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Sep 17 15:44:16 2018 +0200
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../solr/metrics/reporters/jmx/JmxMetricsReporter.java | 10 +++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/922e0162/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1fe923d..fc7813f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -300,6 +300,8 @@ Bug Fixes
* SOLR-11836: FacetStream works with bucketSizeLimit of -1 which will fetch all the buckets.
(Alfonso Muñoz-Pomer Fuentes, Amrit Sarkar via Varun Thacker)
+* SOLR-12765: Incorrect format of JMX cache stats. (Bojan Smid, ab)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/922e0162/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
index ebf47e6..f7a0127 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/jmx/JmxMetricsReporter.java
@@ -50,6 +50,7 @@ import com.codahale.metrics.ObjectNameFactory;
import com.codahale.metrics.Reporter;
import com.codahale.metrics.Timer;
import org.apache.solr.metrics.MetricsMap;
+import org.apache.solr.metrics.SolrMetricManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -558,9 +559,12 @@ public class JmxMetricsReporter implements Reporter, Closeable {
try {
if (filter.matches(name, gauge)) {
final ObjectName objectName = createName("gauges", name);
- if (gauge instanceof MetricsMap) {
- ((MetricsMap)gauge).setAttribute(new Attribute(INSTANCE_TAG, tag));
- registerMBean(gauge, objectName);
+ if (gauge instanceof SolrMetricManager.GaugeWrapper &&
+ ((SolrMetricManager.GaugeWrapper)gauge).getGauge() instanceof MetricsMap) {
+ MetricsMap mm = (MetricsMap)((SolrMetricManager.GaugeWrapper)gauge).getGauge();
+ mm.setAttribute(new Attribute(INSTANCE_TAG, tag));
+ // don't wrap it in a JmxGauge, it already supports all necessary JMX attributes
+ registerMBean(mm, objectName);
} else {
registerMBean(new JmxGauge(gauge, objectName, tag), objectName);
}