Skip to content

Wait for currently active merges when executing OPTIMIZE FINAL on RMT#62067

Merged
nickitat merged 4 commits intoClickHouse:masterfrom
nickitat:stronger_optimize_final_with_rmt
Apr 22, 2024
Merged

Wait for currently active merges when executing OPTIMIZE FINAL on RMT#62067
nickitat merged 4 commits intoClickHouse:masterfrom
nickitat:stronger_optimize_final_with_rmt

Conversation

@nickitat
Copy link
Copy Markdown
Member

@nickitat nickitat commented Mar 28, 2024

Changelog category (leave one):

  • Improvement

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

OPTIMIZE FINAL for ReplicatedMergeTree now will wait for currently active merges to finish and then reattempt to schedule a final merge. This will put it more in line with ordinary MergeTree behaviour.

cc @tavplubix

@robot-ch-test-poll robot-ch-test-poll added the pr-improvement Pull request with some product improvements label Mar 28, 2024
@robot-ch-test-poll
Copy link
Copy Markdown
Contributor

robot-ch-test-poll commented Mar 28, 2024 •
edited by robot-clickhouse-ci-2
Loading

This is an automated comment for commit 0bd3d5d 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
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⏳ pending
Stateful testsRuns stateful functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ failure
Stateless testsRuns stateless functional tests for ClickHouse binaries built in various configurations -- release, debug, with sanitizers, etc❌ failure
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❌ failure
Successful checks
Check nameDescriptionStatus
A SyncThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
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
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. 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
PR CheckThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ 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
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

@nickitat nickitat force-pushed the stronger_optimize_final_with_rmt branch from 95196ca to becedbd Compare March 28, 2024 18:43
tavplubix
tavplubix reviewed Apr 3, 2024
View reviewed changes
src/Storages/StorageReplicatedMergeTree.cpp
/// Here we trying to have a similar behaviour to ordinary MergeTree: if some merges are already in progress - let's wait for them to finish.
/// This way `optimize final` won't just silently be a noop (if also `optimize_throw_if_noop=false`), but will wait for the active merges and repeat an attempt to schedule final merge.
/// This guarantees are enough for tests, because there we have full control over insertions.
const auto wait_timeout = query_context->getSettingsRef().receive_timeout.totalMilliseconds() / max_retries;
Copy link
Copy Markdown
Member

@tavplubix tavplubix Apr 3, 2024

Choose a reason for hiding this comment

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

OPTIMIZE does not send progress, so client will disconnect after the first try, and it will not receive the exception
Also, max_retries * receive_timeout = 50 minutes, it's too much

Copy link
Copy Markdown
Member Author

@nickitat nickitat Apr 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

because of that I set each individual timeout to receive_timeout / max_retries
maybe I missed your point

Copy link
Copy Markdown
Member

@tavplubix tavplubix Apr 9, 2024

Choose a reason for hiding this comment

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

Ah, sorry, I missed / max_retries

@nickitat nickitat force-pushed the stronger_optimize_final_with_rmt branch from 1217fce to dd45151 Compare April 10, 2024 15:29
@nickitat nickitat added this pull request to the merge queue Apr 22, 2024
Merged via the queue into ClickHouse:master with commit aaaff1f Apr 22, 2024
@nickitat nickitat deleted the stronger_optimize_final_with_rmt branch April 22, 2024 20:08
@robot-ch-test-poll2 robot-ch-test-poll2 added the pr-synced-to-cloud The PR is synced to the cloud repo label Apr 22, 2024
@tavplubix
Copy link
Copy Markdown
Member

tavplubix commented Apr 24, 2024

@nickitat looks like it breaks 00993_system_parts_race_condition_drop_zookeeper

@nickitat
Copy link
Copy Markdown
Member Author

nickitat commented Apr 24, 2024

@nickitat looks like it breaks 00993_system_parts_race_condition_drop_zookeeper

seems like it should be enough to adjust wait timeout #62908

@Algunenano Algunenano mentioned this pull request Apr 25, 2024
Closed
@tavplubix tavplubix mentioned this pull request Jul 12, 2024
Merged
19 tasks
@den-crane den-crane mentioned this pull request Nov 19, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tavplubix tavplubix tavplubix approved these changes

Assignees

@tavplubix tavplubix

Labels

pr-improvement Pull request with some product improvements 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.

4 participants

@nickitat @robot-ch-test-poll @tavplubix @robot-ch-test-poll2