-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
fix: deadlock when closing transient push query #4297
Merged
big-andy-coates
merged 3 commits into
confluentinc:master
from
big-andy-coates:transient_deadlock
Jan 14, 2020
Merged
fix: deadlock when closing transient push query #4297
big-andy-coates
merged 3 commits into
confluentinc:master
from
big-andy-coates:transient_deadlock
Jan 14, 2020
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: confluentinc#4296 The produce side not calls `offer` in a loop, with a short timeout, to try and put the row into the blocking queue. When the consume side closes the query, e.g. on an `EOFException` if the user has closed the connection, the query first closes the queue; setting a flag the producers are checking on each loop; causing any producers to exit the loop. Then it can safely close the KS topology.
We may want to backport this onto 5.4.1. But I'll do that manually. |
agavra
approved these changes
Jan 13, 2020
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice find @big-andy-coates!
ksql-engine/src/main/java/io/confluent/ksql/query/BlockingQueryQueue.java
Outdated
Show resolved
Hide resolved
ksql-engine/src/main/java/io/confluent/ksql/query/BlockingQueryQueue.java
Outdated
Show resolved
Hide resolved
ksql-engine/src/main/java/io/confluent/ksql/query/BlockingQueryQueue.java
Outdated
Show resolved
Hide resolved
big-andy-coates
added a commit
that referenced
this pull request
Jan 14, 2020
fixes: #4296 The produce side not calls `offer` in a loop, with a short timeout, to try and put the row into the blocking queue. When the consume side closes the query, e.g. on an `EOFException` if the user has closed the connection, the query first closes the queue; setting a flag the producers are checking on each loop; causing any producers to exit the loop. Then it can safely close the KS topology. (cherry picked from commit 6b5ce0c)
big-andy-coates
added a commit
that referenced
this pull request
Jan 14, 2020
This reverts commit ac8fb63
big-andy-coates
added a commit
to big-andy-coates/ksql
that referenced
this pull request
Jan 14, 2020
fixes: confluentinc#4296 The produce side not calls `offer` in a loop, with a short timeout, to try and put the row into the blocking queue. When the consume side closes the query, e.g. on an `EOFException` if the user has closed the connection, the query first closes the queue; setting a flag the producers are checking on each loop; causing any producers to exit the loop. Then it can safely close the KS topology. (cherry picked from commit 6b5ce0c)
big-andy-coates
added a commit
to big-andy-coates/ksql
that referenced
this pull request
Jan 14, 2020
big-andy-coates
added a commit
to big-andy-coates/ksql
that referenced
this pull request
Jan 14, 2020
fixes: confluentinc#4296 The produce side not calls `offer` in a loop, with a short timeout, to try and put the row into the blocking queue. When the consume side closes the query, e.g. on an `EOFException` if the user has closed the connection, the query first closes the queue; setting a flag the producers are checking on each loop; causing any producers to exit the loop. Then it can safely close the KS topology. (cherry picked from commit 6b5ce0c)
2 tasks
big-andy-coates
added a commit
that referenced
this pull request
Jan 26, 2020
* fix: deadlock when closing transient push query (#4297) fixes: #4296 The produce side not calls `offer` in a loop, with a short timeout, to try and put the row into the blocking queue. When the consume side closes the query, e.g. on an `EOFException` if the user has closed the connection, the query first closes the queue; setting a flag the producers are checking on each loop; causing any producers to exit the loop. Then it can safely close the KS topology. (cherry picked from commit 6b5ce0c)
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.
Description
fixes: #4296
The produce side not calls
offer
in a loop, with a short timeout, to try and put the row into the blocking queue. When the consume side closes the query, e.g. on anEOFException
if the user has closed the connection, the query first closes the queue; setting a flag the producers are checking on each loop; causing any producers to exit the loop. Then it can safely close the KS topology.Testing done
Added unit tests and manual testing
Reviewer checklist