jeffkbkim commented on a change in pull request #9050:
URL: https://github.com/apache/kafka/pull/9050#discussion_r459016030
##########
File path:
core/src/test/scala/unit/kafka/controller/ControllerIntegrationTest.scala
##########
@@ -598,6 +603,86 @@ class ControllerIntegrationTest extends
ZooKeeperTestHarness {
}, "Broker fail to initialize after restart")
}
+ @Test
+ def testPreemptionOnControllerShutdown(): Unit = {
+ servers = makeServers(1, enableControlledShutdown = false)
+ val controller = getController().kafkaController
+ val count = new AtomicInteger(2)
+ val latch = new CountDownLatch(1)
+ val spyThread = spy(controller.eventManager.thread)
+ controller.eventManager.setControllerEventThread(spyThread)
+ val processedEvent = new MockEvent(ControllerState.TopicChange) {
+ override def process(): Unit = latch.await()
+ override def preempt(): Unit = {}
+ }
+ val preemptedEvent = new MockEvent(ControllerState.TopicChange) {
+ override def process(): Unit = {}
+ override def preempt(): Unit = count.decrementAndGet()
+ }
+
+ controller.eventManager.put(processedEvent)
+ controller.eventManager.put(preemptedEvent)
+ controller.eventManager.put(preemptedEvent)
+
+ doAnswer((_: InvocationOnMock) => {
+ latch.countDown()
+ }).doCallRealMethod().when(spyThread).awaitShutdown()
Review comment:
@jsancio In the suggested code, `latch.await()` blocks the event thread
from shutting down while `thread.awaitShutdown()` (called in
`controller.shutdown()`) blocks the main thread from reaching
`latch.countDown()` causing a deadlock. The fix is to call `latch.countDown()`
before `thread.awaitShutdown()` which has been implemented using `spy`.
Please let me know if there's another way to keep the `thread` field as a
`val`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
