GH-8778: Fix KafkaMessageSource deadlock #8780
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes spring-projects#8778 The `KafkaMessageSource.doReceive()` have a lock around its whole body. That includes the `pollRecord()` which can be blocked on the `KafkaConsumer.poll()`. This way the rest of lifecycle management callbacks can be blocked until `KafkaConsumer.poll()` returns. * Rework lifecycle management flags to `AtomicBoolean` since there is not too much work in their respective callbacks * Decrease a locking block in the `doReceive()` just to consumer setup part. Leave `pollRecord()` outside of the lock * Add `this.consumer.wakeup()` into `stopConsumer()` to break a `poll()` cycle and return immediately for the next `close()` call **Cherry-pick to `6.1.x` & `6.0.x`**
|
CC @sobychacko |
|
LGTM, @artembilan |
garyrussell
suggested changes
Oct 26, 2023
| finally { | ||
| this.lock.unlock(); | ||
| } | ||
| stopConsumer(); |
There was a problem hiding this comment.
if (this.running.compareAndSet(true, false)) {...}
| finally { | ||
| this.lock.unlock(); | ||
| } | ||
| this.running.set(true); |
There was a problem hiding this comment.
if (this.running.compareAndSet(false, true)) {...}
I have back-ported today such a fix: 991d29e |
garyrussell
approved these changes
Oct 26, 2023
garyrussell
pushed a commit
that referenced
this pull request
Oct 26, 2023
* GH-8778: Fix KafkaMessageSource deadlock Fixes #8778 The `KafkaMessageSource.doReceive()` have a lock around its whole body. That includes the `pollRecord()` which can be blocked on the `KafkaConsumer.poll()`. This way the rest of lifecycle management callbacks can be blocked until `KafkaConsumer.poll()` returns. * Rework lifecycle management flags to `AtomicBoolean` since there is not too much work in their respective callbacks * Decrease a locking block in the `doReceive()` just to consumer setup part. Leave `pollRecord()` outside of the lock * Add `this.consumer.wakeup()` into `stopConsumer()` to break a `poll()` cycle and return immediately for the next `close()` call **Cherry-pick to `6.1.x` & `6.0.x`** * * Use `compareAndSet` in `start` & `stop`
garyrussell
pushed a commit
that referenced
this pull request
Oct 26, 2023
* GH-8778: Fix KafkaMessageSource deadlock Fixes #8778 The `KafkaMessageSource.doReceive()` have a lock around its whole body. That includes the `pollRecord()` which can be blocked on the `KafkaConsumer.poll()`. This way the rest of lifecycle management callbacks can be blocked until `KafkaConsumer.poll()` returns. * Rework lifecycle management flags to `AtomicBoolean` since there is not too much work in their respective callbacks * Decrease a locking block in the `doReceive()` just to consumer setup part. Leave `pollRecord()` outside of the lock * Add `this.consumer.wakeup()` into `stopConsumer()` to break a `poll()` cycle and return immediately for the next `close()` call **Cherry-pick to `6.1.x` & `6.0.x`** * * Use `compareAndSet` in `start` & `stop`
|
...and cherry-picked. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8778
The
KafkaMessageSource.doReceive()have a lock around its whole body. That includes thepollRecord()which can be blocked on theKafkaConsumer.poll(). This way the rest of lifecycle management callbacks can be blocked untilKafkaConsumer.poll()returns.AtomicBooleansince there is not too much work in their respective callbacksdoReceive()just to consumer setup part. LeavepollRecord()outside of the lockthis.consumer.wakeup()intostopConsumer()to break apoll()cycle and return immediately for the nextclose()callCherry-pick to
6.1.x&6.0.x