Skip to content

fix(issues1078): fix RequestChannel shutdown blocking #1080

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
merged 1 commit into from
Apr 2, 2024
Merged

fix(issues1078): fix RequestChannel shutdown blocking #1080

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
11 changes: 9 additions & 2 deletions core/src/main/scala/kafka/network/RequestChannel.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ class RequestChannel(val queueSize: Int,
private val responseQueueSizeMetricName = metricNamePrefix.concat(ResponseQueueSizeMetric)
private val callbackQueue = new ArrayBlockingQueue[BaseRequest](queueSize)
private val multiCallbackQueue = new java.util.ArrayList[ArrayBlockingQueue[BaseRequest]]()
private var notifiedShutdown = false

metricsGroup.newGauge(requestQueueSizeMetricName, () => {
if (multiRequestQueue.size() != 0) {
Expand Down Expand Up @@ -544,8 +545,14 @@ class RequestChannel(val queueSize: Int,
}

def sendShutdownRequest(): Unit = {
requestQueue.put(ShutdownRequest)
multiRequestQueue.forEach(q => q.put(ShutdownRequest))
if (multiRequestQueue.size() != 0) {
if (!notifiedShutdown) {
notifiedShutdown = true
multiRequestQueue.forEach(q => q.put(ShutdownRequest))
}
} else {
requestQueue.put(ShutdownRequest)
}
}

def sendCallbackRequest(request: CallbackRequest): Unit = {
Expand Down