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.

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

Fix a stupid case of intersecting parts #58482

Merged
merged 2 commits into from Jan 5, 2024

Conversation

tavplubix
Copy link
Member

@tavplubix tavplubix commented Jan 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):

Fix Part ... intersects part ... error that might occur in ReplicatedMergeTree when the server was restarted just after [automatically] dropping [an empty] part and adjacent parts were merged. The bug was introduced in #56282

@tavplubix tavplubix added pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud labels Jan 3, 2024
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-bugfix Pull request with bugfix, not backported by default label Jan 3, 2024
@robot-clickhouse-ci-2
Copy link
Contributor

robot-clickhouse-ci-2 commented Jan 3, 2024

This is an automated comment for commit bc1c05e 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 checkThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ 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
Mergeable CheckChecks if all other necessary checks are successful✅ 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
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
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests❌ failure

/// We can only create a covering part for a blocks range that starts with 0 (otherwise we may get "intersecting parts").
/// Maybe we could do it by incrementing mutation version to get a name for the empty covering part,
/// but it's okay to simple avoid creating it for DROP PART
bool is_drop_part = drop_range.min_block;
Copy link
Member

Choose a reason for hiding this comment

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

This is difficult to understand.

Here, I can read that "the range means 'drop part' if the min block number is not zero" which contradicts the comment.

Also, why it's "drop part", not "drop partition"?

Moreover, it's unclear when we have a zero block number. I thought block numbers start from one.

Copy link
Member Author

Choose a reason for hiding this comment

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

"the range means 'drop part' if the min block number is not zero" which contradicts the comment

Yes, that's correct, but it does not contradict the comment. What do you find contradictory?

Also, why it's "drop part", not "drop partition"?

Because we have a problem with "drop part", not with "drop partition"

Moreover, it's unclear when we have a zero block number. I thought block numbers start from one.

Block numbers start from 1 for MergeTree. For ReplicatedMergeTree they start from 0. So we have 0 for the first block in partition, and for all DROP_RANGEs for the whole partition

Copy link
Member

Choose a reason for hiding this comment

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

Block numbers start from 1 for MergeTree. For ReplicatedMergeTree they start from 0.

This is non obvious and has to be clarified in comments.
Would you mind also changing the first block number to 0 for non-replicated MergeTree?

What do you find contradictory?

If we drop a part with block number zero, it will be a "drop part" operation, but bool is_drop_part will be false.

Copy link
Member Author

Choose a reason for hiding this comment

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

Would you mind also changing the first block number to 0 for non-replicated MergeTree?

I can change it in a separate PR, but it will require updating a few hundred tests...

If we drop a part with block number zero, it will be a "drop part" operation, but bool is_drop_part will be false.

Yes, you're right. But it's not a problem because we don't have any parts on the left of the range, so we don't need to distinguish "drop part" in this case. I will update the comment and change the flag name

@alexey-milovidov alexey-milovidov self-assigned this Jan 5, 2024
@alexey-milovidov alexey-milovidov merged commit e24ec55 into master Jan 5, 2024
267 of 268 checks passed
@alexey-milovidov alexey-milovidov deleted the fix_new_intersecting_parts branch January 5, 2024 20:53
robot-clickhouse added a commit that referenced this pull request Jan 5, 2024
…24435aa3ccd39110a164f01ca084cd

Cherry pick #58482 to 23.11: Fix a stupid case of intersecting parts
robot-clickhouse added a commit that referenced this pull request Jan 5, 2024
…24435aa3ccd39110a164f01ca084cd

Cherry pick #58482 to 23.12: Fix a stupid case of intersecting parts
@robot-clickhouse robot-clickhouse added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Jan 5, 2024
alexey-milovidov added a commit that referenced this pull request Jan 6, 2024
Backport #58482 to 23.11: Fix a stupid case of intersecting parts
alexey-milovidov added a commit that referenced this pull request Jan 6, 2024
Backport #58482 to 23.12: Fix a stupid case of intersecting parts
@tavplubix tavplubix mentioned this pull request Jan 7, 2024
tavplubix added a commit that referenced this pull request Jan 7, 2024
robot-ch-test-poll2 added a commit that referenced this pull request Jan 7, 2024
…b32b13d50ca6cc857a514df6acc62e

Cherry pick #58574 to 23.11: Follow-up to #58482
robot-clickhouse added a commit that referenced this pull request Jan 7, 2024
robot-ch-test-poll2 added a commit that referenced this pull request Jan 7, 2024
…b32b13d50ca6cc857a514df6acc62e

Cherry pick #58574 to 23.12: Follow-up to #58482
robot-clickhouse added a commit that referenced this pull request Jan 7, 2024
robot-ch-test-poll4 added a commit that referenced this pull request Jan 8, 2024
robot-ch-test-poll3 added a commit that referenced this pull request Jan 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud pr-bugfix Pull request with bugfix, not backported by default pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants