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

Cleanup moving parts #50489

Merged
merged 9 commits into from Jun 16, 2023
Merged

Cleanup moving parts #50489

merged 9 commits into from Jun 16, 2023

Conversation

vdimir
Copy link
Member

@vdimir vdimir commented Jun 2, 2023

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

  • Clean moving parts that was merged or mutated during move

TODO:

  • Try to add stress tests. I managed to reproduce locally but not sure if tests would be stable enough and what to check (probably system.remote_data_paths)

@vdimir vdimir requested a review from tavplubix June 2, 2023 15:59
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-bugfix Pull request with bugfix, not backported by default label Jun 2, 2023
@robot-ch-test-poll1
Copy link
Contributor

robot-ch-test-poll1 commented Jun 2, 2023

This is an automated comment for commit ac63861 with description of existing statuses. It's updated for the latest CI running
The full report is available here
The overall status of the commit is 🔴 failure

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
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
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
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
Push to DockerhubThe check for building and pushing the CI related docker images to docker hub🟢 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🔴 failure
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

src/Storages/MergeTree/MergeTreeData.cpp Outdated Show resolved Hide resolved
Comment on lines 246 to 249
String data_part_directory = cloned_part_storage->getFullPath();

TemporaryClonedPart cloned_part;
cloned_part.temporary_directory_lock = data->getTemporaryPartDirectoryHolder(data_part_directory);
Copy link
Member

Choose a reason for hiding this comment

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

Does/should data_part_directory include moving/?

Copy link
Member

Choose a reason for hiding this comment

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

Let's set temporary_directories_lifetime to 1 in tests for background moves

Copy link
Member Author

@vdimir vdimir Jun 2, 2023

Choose a reason for hiding this comment

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

Does/should data_part_directory include moving/?

Yes, since we lock part in moving directory before it's renamed.

cloned_part_storage = part->makeCloneOnDisk(disk, MergeTreeData::MOVING_DIR_NAME);

Let's set temporary_directories_lifetime to 1 in tests for background moves

Added to some integration tests, for stateless already set

<temporary_directories_lifetime>1</temporary_directories_lifetime>

Copy link
Member Author

@vdimir vdimir Jun 5, 2023

Choose a reason for hiding this comment

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

src/Storages/MergeTree/MergeTreePartsMover.cpp Outdated Show resolved Hide resolved
String data_part_directory = cloned_part_storage->getFullPath();

TemporaryClonedPart cloned_part;
cloned_part.temporary_directory_lock = data->getTemporaryPartDirectoryHolder(data_part_directory);
Copy link
Member

Choose a reason for hiding this comment

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

We should hold the temp dir lock until the part is renamed to persistent name (renameTo in swapClonedPart)

@vdimir
Copy link
Member Author

vdimir commented Jun 5, 2023

Fixed couple of things:

getTemporaryPartDirectoryHolder should accept only basename and also should be taken earlier, before makeCloneOnDisk is called.

  • Also part was deleted only in clearOldParts but not in descrtuctor because of this check

if (!startsWith(file_name, "tmp") && !endsWith(file_name, ".tmp_proj"))
{
LOG_ERROR(
storage.log,
"~DataPart() should remove part {} but its name doesn't start with \"tmp\" or end with \".tmp_proj\". Too "
"suspicious, keeping the part.",
path);

Adjusted check to include parts from moving/

  • Also added test, locally works fine, let's check in flaky check

Comment on lines 81 to 83
except QueryRuntimeException as e:
# PART_IS_TEMPORARILY_LOCKED
assert 384 == e.returncode
Copy link
Member Author

Choose a reason for hiding this comment

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

Is it fine to ignore/retry such an error?

@CheSema
Copy link
Member

CheSema commented Jun 6, 2023

Does this solve it? #49197

@vdimir
Copy link
Member Author

vdimir commented Jun 6, 2023

@CheSema yes, your description is exactly the same

@vdimir vdimir force-pushed the vdimir/alter_moving_garbage branch from 67f4357 to bc4e95c Compare June 7, 2023 18:04
@vdimir
Copy link
Member Author

vdimir commented Jun 7, 2023

I added to test case with replicated merge tree and check for a content of table. Locally it passes in release/debug both with minio and aws s3. Waiting for CI results...

@vdimir vdimir force-pushed the vdimir/alter_moving_garbage branch from bc4e95c to 989540e Compare June 7, 2023 18:16
@vdimir vdimir force-pushed the vdimir/alter_moving_garbage branch from 505100e to ac63861 Compare June 8, 2023 10:30
@vdimir
Copy link
Member Author

vdimir commented Jun 8, 2023

I added a config parameter (<allow_remove_stale_moving_parts>) to enable cleanup only if it's set. Let's merge the PR and wait for a couple of weeks if everything is alright in CI, then we will enable it.

@KochetovNicolai KochetovNicolai merged commit df1ea0b into master Jun 16, 2023
259 of 261 checks passed
@KochetovNicolai KochetovNicolai deleted the vdimir/alter_moving_garbage branch June 16, 2023 13:39
KochetovNicolai added a commit that referenced this pull request Jun 21, 2023
Cleanup moving parts

(cherry picked from commit df1ea0b)
@robot-ch-test-poll3 robot-ch-test-poll3 added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Jun 21, 2023
KochetovNicolai added a commit that referenced this pull request Jun 22, 2023
@vdimir vdimir added pr-must-backport Pull request should be backported intentionally. Use this label with great care! and removed pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore labels Aug 31, 2023
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore label Sep 1, 2023
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-bugfix Pull request with bugfix, not backported by default pr-must-backport Pull request should be backported intentionally. Use this label with great care! v23.3-must-backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants