Skip to content

KAFKA-10157: Fix broken tests due to InterruptedException from FinalizedFeatureChangeListener #8857

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
junrao merged 2 commits into from
Jun 12, 2020
Merged

KAFKA-10157: Fix broken tests due to InterruptedException from FinalizedFeatureChangeListener #8857

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d131ecb
KAFKA-10157: Fix broken tests due to FinalizedFeatureChangeListener i…
kowshik Jun 12, 2020
0b296d8
Address comment from @chia7712
kowshik Jun 12, 2020
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
12 changes: 8 additions & 4 deletions core/src/main/scala/kafka/server/FinalizedFeatureChangeListener.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import kafka.zookeeper.{StateChangeHandler, ZNodeChangeHandler}
import org.apache.kafka.common.internals.FatalExitError

import scala.concurrent.TimeoutException
import scala.util.control.Exception.ignoring

/**
* Listens to changes in the ZK feature node, via the ZK client. Whenever a change notification
Expand Down Expand Up @@ -143,10 +142,15 @@ class FinalizedFeatureChangeListener(zkClient: KafkaZkClient) extends Logging {
private class ChangeNotificationProcessorThread(name: String) extends ShutdownableThread(name = name) {
override def doWork(): Unit = {
try {
ignoring(classOf[InterruptedException]) {
queue.take.updateLatestOrThrow()
}
queue.take.updateLatestOrThrow()
} catch {
case ie: InterruptedException =>
// While the queue is empty and this thread is blocking on taking an item from the queue,
// a concurrent call to FinalizedFeatureChangeListener.close() could interrupt the thread
// and cause an InterruptedException to be raised from queue.take(). In such a case, it is
// safe to ignore the exception if the thread is being shutdown. We raise the exception
// here again, because, it is ignored by ShutdownableThread if it is shutting down.

@abbccdda abbccdda Jun 12, 2020

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: if it is shutting down -> when shutting down.

throw ie
case e: Exception => {
error("Failed to process feature ZK node change event. The broker will eventually exit.", e)
throw new FatalExitError(1)
Expand Down