You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jg...@apache.org on 2019/05/29 14:46:11 UTC
[kafka] branch trunk updated: MINOR: Fix transient failure in
PartitionTest.testAddAndRemoveMetrics (#6834)
This is an automated email from the ASF dual-hosted git repository.
jgus 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 348e5d7 MINOR: Fix transient failure in PartitionTest.testAddAndRemoveMetrics (#6834)
348e5d7 is described below
commit 348e5d738fac0047428929970c8e1de226f738ea
Author: Jason Gustafson <ja...@confluent.io>
AuthorDate: Wed May 29 07:45:46 2019 -0700
MINOR: Fix transient failure in PartitionTest.testAddAndRemoveMetrics (#6834)
The test was failing because other test cases are leaving some metrics in the registry. This patch cleans the registry before and after test runs.
Reviewers: Ismael Juma <is...@juma.me.uk>
---
core/src/test/scala/unit/kafka/cluster/PartitionTest.scala | 3 +++
core/src/test/scala/unit/kafka/network/SocketServerTest.scala | 3 +--
.../test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala | 4 ++--
.../test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala | 3 +--
core/src/test/scala/unit/kafka/utils/TestUtils.scala | 7 +++++++
5 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala b/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
index b3e5ade..2b12a04 100644
--- a/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
+++ b/core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
@@ -66,6 +66,8 @@ class PartitionTest {
@Before
def setup(): Unit = {
+ TestUtils.clearYammerMetrics()
+
val logProps = createLogProperties(Map.empty)
logConfig = LogConfig(logProps)
@@ -104,6 +106,7 @@ class PartitionTest {
def tearDown(): Unit = {
logManager.shutdown()
Utils.delete(tmpDir)
+ TestUtils.clearYammerMetrics()
}
@Test
diff --git a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
index 0a8ce1d..5162d7e 100644
--- a/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
+++ b/core/src/test/scala/unit/kafka/network/SocketServerTest.scala
@@ -68,8 +68,7 @@ class SocketServerTest {
val localAddress = InetAddress.getLoopbackAddress
// Clean-up any metrics left around by previous tests
- for (metricName <- YammerMetrics.defaultRegistry.allMetrics.keySet.asScala)
- YammerMetrics.defaultRegistry.removeMetric(metricName)
+ TestUtils.clearYammerMetrics()
val server = new SocketServer(config, metrics, Time.SYSTEM, credentialProvider)
server.startup()
diff --git a/core/src/test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala b/core/src/test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala
index ec57a0f..15ce971 100644
--- a/core/src/test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala
+++ b/core/src/test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala
@@ -19,6 +19,7 @@ package kafka.server
import com.yammer.metrics.Metrics
import com.yammer.metrics.core.Gauge
import kafka.cluster.BrokerEndPoint
+import kafka.utils.TestUtils
import org.apache.kafka.common.TopicPartition
import org.easymock.EasyMock
import org.junit.{Before, Test}
@@ -30,8 +31,7 @@ class AbstractFetcherManagerTest {
@Before
def cleanMetricRegistry(): Unit = {
- for (metricName <- Metrics.defaultRegistry().allMetrics().keySet().asScala)
- Metrics.defaultRegistry().removeMetric(metricName)
+ TestUtils.clearYammerMetrics()
}
private def getMetricValue(name: String): Any = {
diff --git a/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala b/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala
index 1d8249a..55c38a1 100644
--- a/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala
+++ b/core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala
@@ -52,8 +52,7 @@ class AbstractFetcherThreadTest {
@Before
def cleanMetricRegistry(): Unit = {
- for (metricName <- Metrics.defaultRegistry().allMetrics().keySet().asScala)
- Metrics.defaultRegistry().removeMetric(metricName)
+ TestUtils.clearYammerMetrics()
}
private def allMetricsNames: Set[String] = Metrics.defaultRegistry().allMetrics().asScala.keySet.map(_.getName)
diff --git a/core/src/test/scala/unit/kafka/utils/TestUtils.scala b/core/src/test/scala/unit/kafka/utils/TestUtils.scala
index c7f5c24..ea8d2b3 100755
--- a/core/src/test/scala/unit/kafka/utils/TestUtils.scala
+++ b/core/src/test/scala/unit/kafka/utils/TestUtils.scala
@@ -35,6 +35,7 @@ import kafka.security.auth.{Acl, Authorizer, Resource}
import kafka.server._
import kafka.server.checkpoints.OffsetCheckpointFile
import Implicits._
+import com.yammer.metrics.Metrics
import kafka.controller.LeaderIsrAndControllerEpoch
import kafka.zk._
import org.apache.kafka.clients.CommonClientConfigs
@@ -1483,4 +1484,10 @@ object TestUtils extends Logging {
.foldLeft(0.0)((total, metric) => total + metric.metricValue.asInstanceOf[Double])
total.toLong
}
+
+ def clearYammerMetrics(): Unit = {
+ for (metricName <- Metrics.defaultRegistry.allMetrics.keySet.asScala)
+ Metrics.defaultRegistry.removeMetric(metricName)
+ }
+
}