Skip to content

Backport #29544 to 21.10: Avoid deadlocks on JOIN Engine tables#30182

Merged
alexey-milovidov merged 1 commit intoClickHouse:21.10from
Algunenano:21_10_29544
Oct 16, 2021
Merged

Backport #29544 to 21.10: Avoid deadlocks on JOIN Engine tables#30182
alexey-milovidov merged 1 commit intoClickHouse:21.10from
Algunenano:21_10_29544

Conversation

@Algunenano
Copy link
Copy Markdown
Member

@Algunenano Algunenano commented Oct 14, 2021

Backport of #29544

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Avoid deadlocks when reading and writting on JOIN Engine tables at the same time

Detailed description / Documentation draft:

Manual backport of #29544 to 21.10 since there were some conflicts and automatic backport didn't work. The idea is to backport it to other stable releases as long as it doesn't require many tweaks on top of the original PR.

Tested by adding the test (./tests/clickhouse-test 02033_join_engine_deadlock_long) and running it before the changes (blocks and doesn't finish) and after (finishes normally).

@Algunenano Algunenano changed the title Backport #29544 to 21.10 Backport #29544 to 21.10: Avoid deadlocks on JOIN Engine tables Oct 14, 2021
@robot-clickhouse robot-clickhouse added the pr-bugfix Pull request with bugfix, not backported by default label Oct 14, 2021
@Algunenano
Copy link
Copy Markdown
Member Author

The build issue appears because it's testing it with master config (clang 13) and not as a backport. Maybe it needs to be tagged or marked differently, but I don't know how (and I don't have rights to change tags either).

@vdimir vdimir added pr-backport Changes, backported to release branch. Do not use manually - automated use only! and removed pr-bugfix Pull request with bugfix, not backported by default labels Oct 14, 2021
@robot-clickhouse robot-clickhouse added the pr-bugfix Pull request with bugfix, not backported by default label Oct 14, 2021
@vdimir vdimir removed the pr-bugfix Pull request with bugfix, not backported by default label Oct 14, 2021
@robot-clickhouse robot-clickhouse added the pr-bugfix Pull request with bugfix, not backported by default label Oct 14, 2021
@vdimir vdimir removed the pr-bugfix Pull request with bugfix, not backported by default label Oct 14, 2021
@alexey-milovidov
Copy link
Copy Markdown
Member

Let's do optimistic merge...

@alexey-milovidov alexey-milovidov merged commit 0f38290 into ClickHouse:21.10 Oct 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-backport Changes, backported to release branch. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants