Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12070: Fix testJmxIntegration that used obsolete APIs.

This commit is contained in:
Andrzej Bialecki 2018-03-12 14:28:10 +01:00
parent a9fd0754ba
commit 55ba89ef42
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
solr/core/src/java/org/apache/solr/metrics/reporters/SolrJmxReporter.java
View File

@ -54,6 +54,7 @@ public class SolrJmxReporter extends FilteringSolrMetricReporter {
private MetricRegistry registry;
private MBeanServer mBeanServer;
private JmxMetricsReporter reporter;
private String instanceTag;
private boolean started;
/**
@ -98,19 +99,26 @@ public class SolrJmxReporter extends FilteringSolrMetricReporter {
registry = metricManager.registry(registryName);
final MetricFilter filter = newMetricFilter();
String tag = Integer.toHexString(this.hashCode());
instanceTag = Integer.toHexString(this.hashCode());
reporter = JmxMetricsReporter.forRegistry(registry)
.registerWith(mBeanServer)
.inDomain(fullDomain)
.filter(filter)
.createsObjectNamesWith(jmxObjectNameFactory)
.withTag(tag)
.withTag(instanceTag)
.build();
reporter.start();
started = true;
log.info("JMX monitoring for '" + fullDomain + "' (registry '" + registryName + "') enabled at server: " + mBeanServer);
}
/**
* For unit tests.
*/
public String getInstanceTag() {
return instanceTag;
}
/**
* Stops the reporter from publishing metrics.
*/

47
solr/core/src/test/org/apache/solr/core/TestJmxIntegration.java
View File

@ -18,6 +18,7 @@ package org.apache.solr.core;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricReporter;
import org.apache.solr.metrics.reporters.jmx.JmxMetricsReporter;
import org.apache.solr.metrics.reporters.jmx.JmxObjectNameFactory;
import org.apache.solr.metrics.reporters.SolrJmxReporter;
import org.apache.solr.SolrTestCaseJ4;
@ -159,16 +160,30 @@ public class TestJmxIntegration extends SolrTestCaseJ4 {
numDocs > oldNumDocs);
}
@Test @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-2715") // timing problem?
@Test
public void testJmxOnCoreReload() throws Exception {
SolrMetricManager mgr = h.getCoreContainer().getMetricManager();
String registryName = h.getCore().getCoreMetricManager().getRegistryName();
String coreName = h.getCore().getName();
String coreHashCode = String.valueOf(h.getCore().hashCode());
Map<String, SolrMetricReporter> reporters = mgr.getReporters(registryName);
// take first JMX reporter
SolrJmxReporter reporter = null;
for (Map.Entry<String, SolrMetricReporter> e : reporters.entrySet()) {
if (e.getKey().endsWith(coreHashCode) && e.getValue() instanceof SolrJmxReporter) {
reporter = (SolrJmxReporter)e.getValue();
break;
}
}
assertNotNull("could not find JMX reporter for " + registryName, reporter);
String tag = reporter.getInstanceTag();
Set<ObjectInstance> oldBeans = mbeanServer.queryMBeans(null, null);
int oldNumberOfObjects = 0;
for (ObjectInstance bean : oldBeans) {
try {
if (String.valueOf(h.getCore().hashCode()).equals(mbeanServer.getAttribute(bean.getObjectName(), "coreHashCode"))) {
if (tag.equals(mbeanServer.getAttribute(bean.getObjectName(), JmxMetricsReporter.INSTANCE_TAG))) {
oldNumberOfObjects++;
}
} catch (AttributeNotFoundException e) {
@ -176,19 +191,31 @@ public class TestJmxIntegration extends SolrTestCaseJ4 {
}
}
log.info("Before Reload: Size of infoRegistry: " + h.getCore().getInfoRegistry().size() + " MBeans: " + oldNumberOfObjects);
assertEquals("Number of registered MBeans is not the same as info registry size", h.getCore().getInfoRegistry().size(), oldNumberOfObjects);
int totalCoreMetrics = mgr.registry(registryName).getMetrics().size();
log.info("Before Reload: size of all core metrics: " + totalCoreMetrics + " MBeans: " + oldNumberOfObjects);
assertEquals("Number of registered MBeans is not the same as the number of core metrics", totalCoreMetrics, oldNumberOfObjects);
h.getCoreContainer().reload(coreName);
reporters = mgr.getReporters(registryName);
coreHashCode = String.valueOf(h.getCore().hashCode());
// take first JMX reporter
reporter = null;
for (Map.Entry<String, SolrMetricReporter> e : reporters.entrySet()) {
if (e.getKey().endsWith(coreHashCode) && e.getValue() instanceof SolrJmxReporter) {
reporter = (SolrJmxReporter)e.getValue();
break;
}
}
assertNotNull("could not find JMX reporter for " + registryName, reporter);
tag = reporter.getInstanceTag();
Set<ObjectInstance> newBeans = mbeanServer.queryMBeans(null, null);
int newNumberOfObjects = 0;
int registrySize = 0;
try (SolrCore core = h.getCoreContainer().getCore(coreName)) {
registrySize = core.getInfoRegistry().size();
totalCoreMetrics = mgr.registry(registryName).getMetrics().size();
for (ObjectInstance bean : newBeans) {
try {
if (String.valueOf(core.hashCode()).equals(mbeanServer.getAttribute(bean.getObjectName(), "coreHashCode"))) {
if (tag.equals(mbeanServer.getAttribute(bean.getObjectName(), JmxMetricsReporter.INSTANCE_TAG))) {
newNumberOfObjects++;
}
} catch (AttributeNotFoundException e) {
@ -197,7 +224,7 @@ public class TestJmxIntegration extends SolrTestCaseJ4 {
}
}
log.info("After Reload: Size of infoRegistry: " + registrySize + " MBeans: " + newNumberOfObjects);
assertEquals("Number of registered MBeans is not the same as info registry size", registrySize, newNumberOfObjects);
log.info("After Reload: size of all core metrics: " + totalCoreMetrics + " MBeans: " + newNumberOfObjects);
assertEquals("Number of registered MBeans is not the same as the number of core metrics", totalCoreMetrics, newNumberOfObjects);
}
}