Skip to content

KAFKA-9315: The Kafka Metrics class should clear the mbeans map when closing #7851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cmccabe wants to merge 1 commit into from
Closed

KAFKA-9315: The Kafka Metrics class should clear the mbeans map when closing #7851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions clients/src/main/java/org/apache/kafka/common/metrics/JmxReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public void close() {
synchronized (LOCK) {
for (KafkaMbean mbean : this.mbeans.values())
unregister(mbean);
this.mbeans.clear();
}
}

Expand Down
36 changes: 35 additions & 1 deletion clients/src/test/java/org/apache/kafka/common/metrics/MetricsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,14 @@ public class MetricsTest {
private static final double EPS = 0.000001;
private MockTime time = new MockTime();
private MetricConfig config = new MetricConfig();
private JmxReporter jmxReporter;
private Metrics metrics;
private ExecutorService executorService;

@Before
public void setup() {
this.metrics = new Metrics(config, Arrays.asList(new JmxReporter()), time, true);
this.jmxReporter = new JmxReporter();
this.metrics = new Metrics(config, Arrays.asList(jmxReporter), time, true);
}

@After
Expand All @@ -84,6 +86,7 @@ public void tearDown() throws Exception {
executorService.awaitTermination(5, TimeUnit.SECONDS);
}
this.metrics.close();
this.jmxReporter = null;
}

@Test
Expand Down Expand Up @@ -873,4 +876,35 @@ private Sensor createSensor(StatType statType, int index) {
public void testDeprecatedMetricValueMethod() {
verifyStats(KafkaMetric::value);
}

@Test
public void testMetricsClose() {
MetricName test1Name = new MetricName("test1", "testGroup", "test metric 1", Collections.emptyMap());
MetricName test2Name = new MetricName("test2", "testGroup", "test metric 2", Collections.emptyMap());
assertFalse(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test1Name)));
assertFalse(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test2Name)));
assertEquals(1, metrics.metrics().size());
metrics.addMetric(test1Name, new Gauge<Long>() {
@Override
public Long value(MetricConfig config, long now) {
return now;
}
});
assertTrue(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test1Name)));
assertEquals(JmxReporter.getMBeanName("", test1Name), JmxReporter.getMBeanName("", test2Name));
assertEquals(2, metrics.metrics().size());
metrics.addMetric(test2Name, new Gauge<Long>() {
@Override
public Long value(MetricConfig config, long now) {
return now;
}
});
assertTrue(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test1Name)));
assertEquals(3, metrics.metrics().size());
metrics.close();
assertFalse(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test1Name)));
metrics.removeMetric(test1Name);
assertFalse(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test1Name)));
assertFalse(jmxReporter.containsMbean(JmxReporter.getMBeanName("", test2Name)));
}
}