Skip to content

Fix locking inside TimerDescriptor#67702

Merged
alexey-milovidov merged 4 commits intomasterfrom
fix-timer-descriptor-locks
Aug 3, 2024
Merged

Fix locking inside TimerDescriptor#67702
alexey-milovidov merged 4 commits intomasterfrom
fix-timer-descriptor-locks

Conversation

@alexey-milovidov
Copy link
Copy Markdown
Member

@alexey-milovidov alexey-milovidov commented Aug 3, 2024

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):

Due to a bug in Linux Kernel, a query can hung in TimerDescriptor::drain. This closes #37686

Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/

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

@alexey-milovidov alexey-milovidov added the 🍃 green ci 🌿 Fixing flaky tests in CI label Aug 3, 2024
@robot-ch-test-poll4 robot-ch-test-poll4 added the pr-bugfix Pull request with bugfix, not backported by default label Aug 3, 2024
@robot-ch-test-poll
Copy link
Copy Markdown
Contributor

robot-ch-test-poll commented Aug 3, 2024 •
edited by robot-ch-test-poll1
Loading

This is an automated comment for commit 9eb8f4a 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
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ 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
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

@yakov-olkhovskiy yakov-olkhovskiy self-assigned this Aug 3, 2024
yakov-olkhovskiy
yakov-olkhovskiy reviewed Aug 3, 2024
View reviewed changes
src/Common/TimerDescriptor.cpp
/// containing the number of expirations that have occurred.
/// (The returned value is in host byte order—that is, the native byte order for integers on the host machine.)

/// Due to a bug in Linux Kernel, reading from timerfd in non-blocking mode can be still blocking.
Copy link
Copy Markdown
Member

@yakov-olkhovskiy yakov-olkhovskiy Aug 3, 2024

Choose a reason for hiding this comment

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

do you have a link to this bug? what I have found is this:
https://patchwork.kernel.org/project/linux-fsdevel/patch/b4059ed0-5567-44e7-95f7-f7e4b227501c@kernel.dk/
but we avoiding this by breaking the loop on EAGAIN

Copy link
Copy Markdown
Member Author

@alexey-milovidov alexey-milovidov Aug 3, 2024

Choose a reason for hiding this comment

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

No, I didn't find it.

@alexey-milovidov
Copy link
Copy Markdown
Member Author

alexey-milovidov commented Aug 3, 2024

#67730 stood in my way.

@alexey-milovidov
Copy link
Copy Markdown
Member Author

alexey-milovidov commented Aug 3, 2024

WTF: #54748

@alexey-milovidov alexey-milovidov merged commit b8050cc into master Aug 3, 2024
@alexey-milovidov alexey-milovidov deleted the fix-timer-descriptor-locks branch August 3, 2024 22:28
@robot-ch-test-poll4 robot-ch-test-poll4 added the pr-synced-to-cloud The PR is synced to the cloud repo label Aug 3, 2024
This was referenced Nov 14, 2025
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yakov-olkhovskiy yakov-olkhovskiy yakov-olkhovskiy approved these changes

Assignees

@yakov-olkhovskiy yakov-olkhovskiy

Labels

🍃 green ci 🌿 Fixing flaky tests in CI 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.

A query may stuck in TimerDescriptor::drain()

4 participants

@alexey-milovidov @robot-ch-test-poll @yakov-olkhovskiy @robot-ch-test-poll4