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 2017/08/15 01:25:14 UTC
lucene-solr:branch_7_0: Make this test more robust to the presence of
MBeanServer created in other tests.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_0 be596b906 -> b76e47c2e
Make this test more robust to the presence of MBeanServer created in other tests.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b76e47c2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b76e47c2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b76e47c2
Branch: refs/heads/branch_7_0
Commit: b76e47c2e2a470a8d6024c46a966e087886e7ea1
Parents: be596b9
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Aug 15 03:23:28 2017 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Aug 15 03:25:02 2017 +0200
----------------------------------------------------------------------
.../reporters/solr/SolrCloudReportersTest.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b76e47c2/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java
index 001a24d..bed1cca 100644
--- a/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java
+++ b/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java
@@ -28,7 +28,7 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.metrics.AggregateMetric;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricReporter;
-import org.apache.solr.util.JmxUtil;
+import org.apache.solr.metrics.reporters.SolrJmxReporter;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,6 +42,7 @@ public class SolrCloudReportersTest extends SolrCloudTestCase {
int jmxReporter;
+
@BeforeClass
public static void configureDummyCluster() throws Exception {
configureCluster(0).configure();
@@ -52,7 +53,6 @@ public class SolrCloudReportersTest extends SolrCloudTestCase {
shutdownCluster();
leaderRegistries = 0;
clusterRegistries = 0;
- jmxReporter = JmxUtil.findFirstMBeanServer() != null ? 1 : 0;
}
@Test
@@ -100,6 +100,12 @@ public class SolrCloudReportersTest extends SolrCloudTestCase {
assertEquals(5, sor.getPeriod());
for (String registryName : metricManager.registryNames(".*\\.shard[0-9]\\.replica.*")) {
reporters = metricManager.getReporters(registryName);
+ jmxReporter = 0;
+ reporters.forEach((k, v) -> {
+ if (v instanceof SolrJmxReporter) {
+ jmxReporter++;
+ }
+ });
assertEquals(reporters.toString(), 1 + jmxReporter, reporters.size());
reporter = null;
for (String name : reporters.keySet()) {
@@ -159,6 +165,12 @@ public class SolrCloudReportersTest extends SolrCloudTestCase {
assertEquals(reporters.toString(), 0, reporters.size());
for (String registryName : metricManager.registryNames(".*\\.shard[0-9]\\.replica.*")) {
reporters = metricManager.getReporters(registryName);
+ jmxReporter = 0;
+ reporters.forEach((k, v) -> {
+ if (v instanceof SolrJmxReporter) {
+ jmxReporter++;
+ }
+ });
assertEquals(reporters.toString(), 0 + jmxReporter, reporters.size());
}
});