Skip to content

Deadlock in textlog#13386

Merged
nikitamikhaylov merged 4 commits intoClickHouse:masterfrom
nikitamikhaylov:text-log-fix-2
Aug 6, 2020
Merged

Deadlock in textlog#13386
nikitamikhaylov merged 4 commits intoClickHouse:masterfrom
nikitamikhaylov:text-log-fix-2

Conversation

@nikitamikhaylov
Copy link
Copy Markdown
Member

@nikitamikhaylov nikitamikhaylov commented Aug 5, 2020

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Bug Fix

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fixed the deadlock in textlog. It is a part of #12339. This fixes #12325

Detailed description / Documentation draft:
Mutex is needed only to get a shared_ptr from weak_ptr concurrently.

@nikitamikhaylov nikitamikhaylov added the pr-bugfix Pull request with bugfix, not backported by default label Aug 5, 2020
@nikitamikhaylov nikitamikhaylov requested a review from akuzm August 5, 2020 13:37
@nikitamikhaylov
Copy link
Copy Markdown
Member Author

@akuzm It is a part of previous PR to backport it to stable branches.

text_log_locked = text_log.lock();
}
if (text_log_locked)
text_log_locked->add(elem);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an extra tab.

@akuzm akuzm self-assigned this Aug 5, 2020
@nikitamikhaylov nikitamikhaylov merged commit f6fe0b9 into ClickHouse:master Aug 6, 2020
robot-clickhouse pushed a commit that referenced this pull request Aug 6, 2020
robot-clickhouse pushed a commit that referenced this pull request Aug 6, 2020
robot-clickhouse pushed a commit that referenced this pull request Aug 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr-bugfix Pull request with bugfix, not backported by default

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Deadlock in system.text_log

2 participants