Skip to content

KAFKA-7940: Address flakiness of CustomQuotaCallbackTest#testCustomQuotaCallback #6330

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
rajinisivaram merged 3 commits into from
Feb 27, 2019
Merged

KAFKA-7940: Address flakiness of CustomQuotaCallbackTest#testCustomQuotaCallback #6330

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7363334
Add teardown helper for static variables in GroupedUserQuotaCallback
stanislavkozlovski Feb 26, 2019
23613f2
Add sleep after initial user quota configuration
stanislavkozlovski Feb 26, 2019
9e21360
Replace Thread.sleep with quick sanity check
stanislavkozlovski Feb 27, 2019
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
9 changes: 8 additions & 1 deletion core/src/test/scala/integration/kafka/api/CustomQuotaCallbackTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class CustomQuotaCallbackTest extends IntegrationTestHarness with SaslSetup {
@After
override def tearDown(): Unit = {
adminClients.foreach(_.close())
GroupedUserQuotaCallback.tearDown()
super.tearDown()
}

Expand All @@ -102,7 +103,7 @@ class CustomQuotaCallbackTest extends IntegrationTestHarness with SaslSetup {
// ClientQuotaCallback#quotaLimit is invoked by each quota manager once for each new client
assertEquals(1, quotaLimitCalls(ClientQuotaType.PRODUCE).get)
assertEquals(1, quotaLimitCalls(ClientQuotaType.FETCH).get)
assertTrue(s"Too many quotaLimit calls $quotaLimitCalls", quotaLimitCalls(ClientQuotaType.REQUEST).get <= serverCount)
assertTrue(s"Too many quotaLimit calls $quotaLimitCalls", quotaLimitCalls(ClientQuotaType.REQUEST).get <= 10) // sanity check
// Large quota updated to small quota, should throttle
user.configureAndWaitForQuota(9000, 3000)
user.produceConsume(expectProduceThrottle = true, expectConsumeThrottle = true)
Expand Down Expand Up @@ -321,6 +322,12 @@ object GroupedUserQuotaCallback {
ClientQuotaType.REQUEST -> new AtomicInteger
)
val callbackInstances = new AtomicInteger

def tearDown(): Unit = {
callbackInstances.set(0)
quotaLimitCalls.values.foreach(_.set(0))
UnlimitedQuotaMetricTags.clear()
}
}

/**
Expand Down