Skip to content

Fix possible deadlock on query cancel with parallel replicas#66905

Merged
nickitat merged 1 commit intomasterfrom
fix_deadlock_on_cancel
Jul 24, 2024
Merged

Fix possible deadlock on query cancel with parallel replicas#66905
nickitat merged 1 commit intomasterfrom
fix_deadlock_on_cancel

Conversation

@nickitat
Copy link
Copy Markdown
Member

@nickitat nickitat commented Jul 22, 2024 •
edited
Loading

Changelog category (leave one):

  • Bug Fix (user-visible misbehavior in an official stable release)

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

Fix possible deadlock on query cancel with parallel replicas.

Fixes: #66893

CI Settings (Only check the boxes if you know what you are doing):

  • Allow: All Required Checks
  • Allow: Stateless tests
  • Allow: Stateful tests
  • Allow: Integration Tests
  • Allow: Performance tests
  • Allow: All Builds
  • Allow: batch 1, 2 for multi-batch jobs
  • Allow: batch 3, 4, 5, 6 for multi-batch jobs
  • Exclude: Style check
  • Exclude: Fast test
  • Exclude: All with ASAN
  • Exclude: All with TSAN, MSAN, UBSAN, Coverage
  • Exclude: All with aarch64, release, debug
  • Do not test
  • Woolen Wolfdog
  • Upload binaries for special builds
  • Disable merge-commit
  • Disable CI cache

@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-bugfix Pull request with bugfix, not backported by default label Jul 22, 2024
@robot-ch-test-poll3
Copy link
Copy Markdown
Contributor

robot-ch-test-poll3 commented Jul 22, 2024 •
edited by robot-clickhouse
Loading

This is an automated comment for commit ea61af9 with description of existing statuses. It's updated for the latest CI running

❌ Click here to open a full report in a separate page

Check nameDescriptionStatus
Bugfix validationChecks that either a new test (functional or integration) or there some changed tests that fail with the binary built on master branch❌ failure
Successful checks
Check nameDescriptionStatus
AST fuzzerRuns randomly generated queries to catch program errors. The build type is optionally given in parenthesis. If it fails, ask a maintainer for help✅ success
BuildsThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ success
Compatibility checkChecks that clickhouse binary runs on distributions with old libc versions. If it fails, ask a maintainer for help✅ success
Docker keeper imageThe check to build and optionally push the mentioned image to docker hub✅ success
Docker server imageThe check to build and optionally push the mentioned image to docker hub✅ success
Docs checkBuilds and tests the documentation✅ success
Fast testNormally this is the first check that is ran for a PR. It builds ClickHouse and runs most of stateless functional tests, omitting some. If it fails, further checks are not started until it is fixed. Look at the report to see which tests fail, then reproduce the failure locally as described here✅ success
Flaky testsChecks if new added or modified tests are flaky by running them repeatedly, in parallel, with more randomization. Functional tests are run 100 times with address sanitizer, and additional randomization of thread scheduling. Integration tests are run up to 10 times. If at least once a new test has failed, or was too long, this check will be red. We don't allow flaky tests, read the doc✅ success
Install packagesChecks that the built packages are installable in a clear environment✅ success
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests✅ success
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests✅ success
Stateful testsRuns stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc✅ success
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc✅ success
Stress testRuns stateless functional tests concurrently from several clients to detect concurrency-related errors✅ success
Style checkRuns a set of checks to keep the code style clean. If some of tests failed, see the related log from the report✅ success
Unit testsRuns the unit tests for different release types✅ success
Upgrade checkRuns stress tests on server version from last release and then tries to upgrade it to the version from the PR. It checks if the new server can successfully startup without any errors, crashes or sanitizer asserts✅ success

@nickitat nickitat force-pushed the fix_deadlock_on_cancel branch from 07cab50 to ea61af9 Compare July 23, 2024 12:36
@nickitat nickitat marked this pull request as ready for review July 23, 2024 13:13
@vdimir vdimir mentioned this pull request Jul 23, 2024
Merged
19 tasks
@devcrafter devcrafter self-assigned this Jul 23, 2024
devcrafter
devcrafter approved these changes Jul 23, 2024
View reviewed changes
Copy link
Copy Markdown
Member

@devcrafter devcrafter left a comment

Choose a reason for hiding this comment

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

LGTM

@nickitat nickitat added this pull request to the merge queue Jul 24, 2024
Merged via the queue into master with commit 408c5bb Jul 24, 2024
@nickitat nickitat deleted the fix_deadlock_on_cancel branch July 24, 2024 16:27
@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-synced-to-cloud The PR is synced to the cloud repo label Jul 24, 2024
@nickitat nickitat mentioned this pull request Jul 24, 2024
Closed
@nickitat nickitat linked an issue Jul 24, 2024 that may be closed by this pull request
Stateless test 02784_parallel_replicas_automatic_decision_join is flaky #60625
Closed
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 mentioned this pull request Aug 5, 2024
Merged
robot-clickhouse added a commit that referenced this pull request Aug 5, 2024
@robot-clickhouse
Backport #66905 to 24.7: Fix possible deadlock on query cancel with p…
b1fa1a6 
…arallel replicas
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 mentioned this pull request Aug 5, 2024
Merged
@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-backports-created-cloud deprecated label, NOOP label Aug 5, 2024
@robot-clickhouse robot-clickhouse added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Aug 5, 2024
robot-ch-test-poll3 added a commit that referenced this pull request Aug 5, 2024
@robot-ch-test-poll3
Merge pull request #67820 from ClickHouse/backport/24.7/66905
a86fe8b 
Backport #66905 to 24.7: Fix possible deadlock on query cancel with parallel replicas
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@devcrafter devcrafter devcrafter approved these changes

Assignees

@devcrafter devcrafter

Labels

pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud deprecated label, NOOP pr-bugfix Pull request with bugfix, not backported by default pr-synced-to-cloud The PR is synced to the cloud repo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Query with parallel replicas may deadlock on cancel Stateless test 02784_parallel_replicas_automatic_decision_join is flaky

5 participants

@nickitat @robot-ch-test-poll3 @devcrafter @robot-clickhouse @robot-clickhouse-ci-2