Skip to content

(Manual) Backport #29544 to 21.9: Avoid deadlocks on JOIN Engine tables#30185

Merged
vdimir merged 1 commit intoClickHouse:21.9from
Algunenano:21_09_29544
Oct 18, 2021
Merged

(Manual) Backport #29544 to 21.9: Avoid deadlocks on JOIN Engine tables#30185
vdimir merged 1 commit intoClickHouse:21.9from
Algunenano:21_09_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.9 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).

It's a backport, but tagging it as a bug fix since the CI asks for a description.

@robot-clickhouse robot-clickhouse added the pr-bugfix Pull request with bugfix, not backported by default label Oct 14, 2021
@nikitamikhaylov
Copy link
Copy Markdown
Member

Build failed, because we have Clang13 in master, but 21.9 builds successfully only with Clang11. I think we have to merge it, and maybe fix tests in 21.9 branch directly.

@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
@vdimir vdimir merged commit f78bedb into ClickHouse:21.9 Oct 18, 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