This is an automated email from the ASF dual-hosted git repository. jsancio pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push: new 21490af989 MINOR; Test last committed record offset for Controllers (#12249) 21490af989 is described below commit 21490af989ec02916adcd64ea5cf439dbb682525 Author: José Armando García Sancio <jsan...@users.noreply.github.com> AuthorDate: Wed Jun 8 10:45:04 2022 -0700 MINOR; Test last committed record offset for Controllers (#12249) As part of KIP-835, LastCommittedRecordOffset was added to the KafkaController metric type. Make sure to test that metric. Reviewers: Jason Gustafson <ja...@confluent.io> --- core/src/test/scala/unit/kafka/metrics/MetricsTest.scala | 1 + .../apache/kafka/controller/QuorumControllerMetricsTest.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala b/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala index 44a1e53f47..b21fe877f2 100644 --- a/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala +++ b/core/src/test/scala/unit/kafka/metrics/MetricsTest.scala @@ -239,6 +239,7 @@ class MetricsTest extends KafkaServerTestHarness with Logging { assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=PreferredReplicaImbalanceCount"), 1) assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=GlobalTopicCount"), 1) assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=GlobalPartitionCount"), 1) + assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=LastCommittedRecordOffset"), 1) assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=LastAppliedRecordOffset"), 1) assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=LastAppliedRecordTimestamp"), 1) assertEquals(metrics.keySet.asScala.count(_.getMBeanName == "kafka.controller:type=KafkaController,name=LastAppliedRecordLagMs"), 1) diff --git a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsTest.java b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsTest.java index 21ac02f49e..2ab9995594 100644 --- a/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsTest.java +++ b/metadata/src/test/java/org/apache/kafka/controller/QuorumControllerMetricsTest.java @@ -40,9 +40,11 @@ public class QuorumControllerMetricsTest { "GlobalPartitionCount", "OfflinePartitionsCount", "PreferredReplicaImbalanceCount", + "LastAppliedRecordLagMs", "LastAppliedRecordOffset", "LastAppliedRecordTimestamp", - "LastAppliedRecordLagMs"); + "LastCommittedRecordOffset" + ); assertMetricsCreatedAndRemovedUponClose(expectedType, expectedMetricNames); } @@ -92,6 +94,7 @@ public class QuorumControllerMetricsTest { try (QuorumControllerMetrics quorumControllerMetrics = new QuorumControllerMetrics(registry, time)) { quorumControllerMetrics.setLastAppliedRecordOffset(100); quorumControllerMetrics.setLastAppliedRecordTimestamp(500); + quorumControllerMetrics.setLastCommittedRecordOffset(50); @SuppressWarnings("unchecked") Gauge<Long> lastAppliedRecordOffset = (Gauge<Long>) registry @@ -110,6 +113,12 @@ public class QuorumControllerMetricsTest { .allMetrics() .get(metricName("KafkaController", "LastAppliedRecordLagMs")); assertEquals(time.milliseconds() - 500, lastAppliedRecordLagMs.value()); + + @SuppressWarnings("unchecked") + Gauge<Long> lastCommittedRecordOffset = (Gauge<Long>) registry + .allMetrics() + .get(metricName("KafkaController", "LastCommittedRecordOffset")); + assertEquals(50, lastCommittedRecordOffset.value()); } } finally { registry.shutdown();