Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Query cache: Fix per-user quota #58731

Merged
merged 3 commits into from
Jan 16, 2024
Merged

Query cache: Fix per-user quota #58731

merged 3 commits into from
Jan 16, 2024

Conversation

rschu1ze
Copy link
Member

@rschu1ze rschu1ze commented Jan 11, 2024 •
edited
Loading

Fixes #58149

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

The query cache now behaves properly when per-user quotas are defined and SYSTEM DROP QUERY CACHE ran.

@rschu1ze rschu1ze changed the title Qc quota Fix per-user quota in query cache Jan 11, 2024
@rschu1ze rschu1ze changed the title Fix per-user quota in query cache Query cache: Fix per-user quota Jan 11, 2024
@robot-clickhouse-ci-1 robot-clickhouse-ci-1 added the pr-bugfix Pull request with bugfix, not backported by default label Jan 11, 2024
@robot-clickhouse-ci-1
Copy link
Contributor

robot-clickhouse-ci-1 commented Jan 11, 2024 •
edited by robot-ch-test-poll2
Loading

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

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

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
Bugfix validate checkChecks that either a new test (functional or integration) or there some changed tests that fail with the binary built on master branch✅ success
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✅ 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 image for serversThe 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. Integrational 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
SQLTestThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
SQLancerFuzzing tests that detect logical bugs with SQLancer tool✅ success
SqllogicRun clickhouse on the sqllogic test set against sqlite and checks that all statements are passed✅ 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
Check nameDescriptionStatus
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

alexey-milovidov
alexey-milovidov reviewed Jan 12, 2024
View reviewed changes
tests/queries/0_stateless/00949_format.sql Outdated
@@ -226,3 +226,5 @@ select format('{}{}{}', materialize(toFixedString('a', 1)), toFixedString('b', 1
select format('{}{}{}', materialize(toFixedString('a', 1)), toFixedString('b', 1), materialize(toFixedString('c', 1))) == 'abc' from system.numbers limit 5;
select format('{}{}{}', materialize(toFixedString('a', 1)), materialize(toFixedString('b', 1)), toFixedString('c', 1)) == 'abc' from system.numbers limit 5;
select format('{}{}{}', materialize(toFixedString('a', 1)), materialize(toFixedString('b', 1)), materialize(toFixedString('c', 1))) == 'abc' from system.numbers limit 5;

SELECT isConstant(format('{}, world', 'Hello'));
Copy link
Member

Choose a reason for hiding this comment

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

It's much better to add new test cases to new tests instead of modifying the existing ones.

The advantages are:

  • you get a more granular report when only a single case has failed;
  • the history of test runs is consistent;
  • it is easier to attribute tests to particular changes in the code.

Copy link
Member Author

Choose a reason for hiding this comment

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

Okay, these reasons are valid. Will do.

@rschu1ze
QueryCache: Fix odd bugs with user quota
5357e8f 
- SYSTEM DROP QUERY CACHE did not clear the user policy statistics, this
  made the cache block all inserts afterwards

- Fixes two other oddities in the approval logic
@devcrafter devcrafter self-assigned this Jan 15, 2024
devcrafter
devcrafter approved these changes Jan 15, 2024
View reviewed changes
src/Common/TTLCachePolicy.h Outdated Show resolved Hide resolved
src/Common/TTLCachePolicy.h Outdated Show resolved Hide resolved
@rschu1ze
Copy link
Member Author

@devcrafter Approve? Thanks!

@rschu1ze rschu1ze merged commit 9146391 into ClickHouse:master Jan 16, 2024
265 of 266 checks passed
@rschu1ze rschu1ze mentioned this pull request Jan 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexey-milovidov alexey-milovidov alexey-milovidov left review comments

@devcrafter devcrafter devcrafter approved these changes

Assignees

@devcrafter devcrafter

Labels
pr-bugfix Pull request with bugfix, not backported by default
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

is query_cache_max_entries working?
4 participants
@rschu1ze @robot-clickhouse-ci-1 @devcrafter @alexey-milovidov