Skip to content

MINOR: Fix transient failure in PartitionTest.testAddAndRemoveMetrics #6834

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

Merged
hachikuji merged 1 commit into from
May 29, 2019
Merged

MINOR: Fix transient failure in PartitionTest.testAddAndRemoveMetrics #6834

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
3 changes: 3 additions & 0 deletions core/src/test/scala/unit/kafka/cluster/PartitionTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ class PartitionTest {

@Before
def setup(): Unit = {
TestUtils.clearYammerMetrics()

val logProps = createLogProperties(Map.empty)
logConfig = LogConfig(logProps)

Expand Down Expand Up @@ -104,6 +106,7 @@ class PartitionTest {
def tearDown(): Unit = {
logManager.shutdown()
Utils.delete(tmpDir)
TestUtils.clearYammerMetrics()
}

@Test
Expand Down
3 changes: 1 addition & 2 deletions core/src/test/scala/unit/kafka/network/SocketServerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/scala/unit/kafka/server/AbstractFetcherManagerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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 = {
Expand Down
3 changes: 1 addition & 2 deletions core/src/test/scala/unit/kafka/server/AbstractFetcherThreadTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 7 additions & 0 deletions core/src/test/scala/unit/kafka/utils/TestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
}

}