Skip to content

Fix possible loss of "Query was cancelled" message in client (fixes 03023_zeros_generate_random_with_limit_progress_bar flakiness)#64888

Merged
antaljanosbenjamin merged 1 commit intoClickHouse:masterfrom
azat:client-cancelled-message
Jun 13, 2024
Merged

Fix possible loss of "Query was cancelled" message in client (fixes 03023_zeros_generate_random_with_limit_progress_bar flakiness)#64888
antaljanosbenjamin merged 1 commit intoClickHouse:masterfrom
azat:client-cancelled-message

Conversation

@azat
Copy link
Copy Markdown
Member

@azat azat commented Jun 6, 2024

Previously "Query was cancelled" had been printed only on new blocks, so if no new blocks will be arrived, then it will not print this message, and this is indeed why 03023_zeros_generate_random_with_limit_progress_bar was flaky 1:

2024-06-05 16:21:22 expect: does "\u258e\u001b[0m                    \u001b[2m(0.9 CPU)\u001b[0m 4%\u001b[K^C\r\u001b[1;31m\u2198\u001b[0m Progress: 404.74 thousand rows, 404.74 KB (806.77 thousand rows/s., 806.77 KB/s.) \u001b[0;32m\u2588\u258e\u001b[0m                    \u001b[2m(2.0 CPU)\u001b[0m 4%\u001b[K\r\u001b[KCancelling query.\r\n                                                                                                                        \r\u001b[1;32m\u2193\u001b[0m Progress: 404.74 thousand rows, 404.74 KB (806.15 thousand rows/s., 806.15 KB/s.) \u001b[0;32m\u2588\u258e\u001b[0m                    \u001b[2m(2.0 CPU)\u001b[0m 4%\u001b[K" (spawn_id exp4) match glob pattern "Query was cancelled."? no
2024-06-05 16:21:22
2024-06-05 16:21:22 [KOk.
2024-06-05 16:21:22 , result:

As you can see it printed "Cancelling query" and "Ok" but not "Query was cancelled" due to this.

A bit hackish with all this bool flags, but I guess it is OK.

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

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

Fix possible loss of "Query was cancelled" message in client

Cc: @alexey-milovidov (03023_zeros_generate_random_with_limit_progress_bar test)

@azat azat mentioned this pull request Jun 6, 2024
Merged
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-not-for-changelog This PR should not be mentioned in the changelog label Jun 6, 2024
@robot-ch-test-poll2
Copy link
Copy Markdown
Contributor

robot-ch-test-poll2 commented Jun 6, 2024 •
edited by robot-clickhouse-ci-2
Loading

This is an automated comment for commit 15317b5 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
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❌ failure
CI runningA meta-check that indicates the running CI. Normally, it's in success or pending state. The failed status indicates some problems with the PR❌ failure
Performance ComparisonMeasure changes in query performance. The performance test report is described in detail here. In square brackets are the optional part/total tests❌ failure
Successful checks
Check nameDescriptionStatus
A SyncIf it fails, ask a maintainer for help✅ success
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ success
ClickHouse build checkBuilds ClickHouse in various configurations for use in further steps. You have to fix the builds that fail. Build logs often has enough information to fix the error, but you might have to reproduce the failure locally. The cmake options can be found in the build log, grepping for cmake. Use these options and follow the general build process✅ 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
Mergeable CheckChecks if all other necessary checks are successful✅ success
PR CheckChecks correctness of the PR's body✅ 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

@azat
Copy link
Copy Markdown
Member Author

azat commented Jun 6, 2024 •
edited
Loading

Integration tests (asan, old analyzer) [2/6] — fail: 1, passed: 393

Integration tests (asan, old analyzer) [5/6] — fail: 1, passed: 590

@azat azat mentioned this pull request Jun 6, 2024
Merged
31 tasks
@antaljanosbenjamin antaljanosbenjamin self-assigned this Jun 6, 2024
@azat azat force-pushed the client-cancelled-message branch from 9be6307 to 2c5a2df Compare June 6, 2024 12:56
@azat
Fix possible loss of "Query was cancelled" message in client
15317b5 
Previously "Query was cancelled" had been printed only on new blocks, so
if no new blocks will be arrived, then it will not print this message,
and this is indeed why 03023_zeros_generate_random_with_limit_progress_bar
was flaky [1]:

    2024-06-05 16:21:22 expect: does "\u258e\u001b[0m                    \u001b[2m(0.9 CPU)\u001b[0m 4%\u001b[K^C\r\u001b[1;31m\u2198\u001b[0m Progress: 404.74 thousand rows, 404.74 KB (806.77 thousand rows/s., 806.77 KB/s.) \u001b[0;32m\u2588\u258e\u001b[0m                    \u001b[2m(2.0 CPU)\u001b[0m 4%\u001b[K\r\u001b[KCancelling query.\r\n                                                                                                                        \r\u001b[1;32m\u2193\u001b[0m Progress: 404.74 thousand rows, 404.74 KB (806.15 thousand rows/s., 806.15 KB/s.) \u001b[0;32m\u2588\u258e\u001b[0m                    \u001b[2m(2.0 CPU)\u001b[0m 4%\u001b[K" (spawn_id exp4) match glob pattern "Query was cancelled."? no
    2024-06-05 16:21:22
    2024-06-05 16:21:22 [KOk.
    2024-06-05 16:21:22 , result:

As you can see it printed "Cancelling query" and "Ok" but not
"Query was cancelled" due to this.

  [1]: https://s3.amazonaws.com/clickhouse-test-reports/61973/6cfd5b2165970a65a551117fe58e4b9d22237b8c/stateless_tests__tsan__s3_storage__[1_5].html

A bit hackish with all this bool flags, but I guess it is OK.

Signed-off-by: Azat Khuzhin <[email protected]>
@azat azat force-pushed the client-cancelled-message branch from 2c5a2df to 15317b5 Compare June 6, 2024 15:47
@antaljanosbenjamin
Copy link
Copy Markdown
Member

antaljanosbenjamin commented Jun 13, 2024

Fuzzer failed because of unrelated query. Merging.

@antaljanosbenjamin antaljanosbenjamin added this pull request to the merge queue Jun 13, 2024
Merged via the queue into ClickHouse:master with commit 5cff2bc Jun 13, 2024
@azat azat deleted the client-cancelled-message branch June 13, 2024 12:55
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-synced-to-cloud The PR is synced to the cloud repo label Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@antaljanosbenjamin antaljanosbenjamin antaljanosbenjamin approved these changes

Assignees

@antaljanosbenjamin antaljanosbenjamin

Labels

pr-not-for-changelog This PR should not be mentioned in the changelog 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.

3 participants

@azat @robot-ch-test-poll2 @antaljanosbenjamin