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

Use more thread pools in BACKUP/RESTORE to avoid its hanging in tests #55216

Merged

Conversation

vitlibar
Copy link
Member

@vitlibar vitlibar commented Oct 3, 2023

Changelog category:

  • Not for changelog

This PR is a follow-up to #55132, it adds two more thread pools to handle BACKUP ON CLUSTER ASYNC and RESTORE ON CLUSTER ASYNC without possible hanging. The PR also introduces lazily creation of such thread pools.

@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-not-for-changelog This PR should not be mentioned in the changelog label Oct 3, 2023
@robot-ch-test-poll1
Copy link
Contributor

robot-ch-test-poll1 commented Oct 3, 2023

This is an automated comment for commit da5f48e 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
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
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
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
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
Integration testsThe integration tests report. In parenthesis the package type is given, and in square brackets are the optional part/total tests❌ failure

@vitlibar vitlibar force-pushed the backup-use-two-more-thread-pools branch from ca01b5a to 8966ae4 Compare October 3, 2023 14:08
@alesapin alesapin self-assigned this Oct 8, 2023
Copy link
Member

@alesapin alesapin left a comment

Choose a reason for hiding this comment

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

Too complex and general solution, which doesn't protect from the mentioned error. But ok, let's do it this way.

private:
const size_t num_backup_threads;
const size_t num_restore_threads;
std::unique_ptr<ThreadPool> thread_pools[static_cast<size_t>(ThreadPoolId::MAX)] TSA_GUARDED_BY(mutex);
Copy link
Member

Choose a reason for hiding this comment

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

Maybe better to make unordered map for simplicity?

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@alesapin
Copy link
Member

alesapin commented Nov 7, 2023

@vitlibar WDYT?

@vitlibar
Copy link
Member Author

vitlibar commented Nov 7, 2023

@vitlibar WDYT?

I rewrote my code using std::map.

@vitlibar
Copy link
Member Author

vitlibar commented Nov 7, 2023

Too complex and general solution, which doesn't protect from the mentioned error. But ok, let's do it this way.

Why it doesn't protect? I mean now the parallel tasks waiting each others are going to be always in different thread pools. And the reason of that deadlock was exactly that a task could wait another task from the same thread pool.

@vitlibar vitlibar closed this Nov 7, 2023
@vitlibar vitlibar reopened this Nov 7, 2023
@vitlibar vitlibar force-pushed the backup-use-two-more-thread-pools branch from 5d1602f to da5f48e Compare November 8, 2023 07:46
@alesapin alesapin merged commit 4a097cd into ClickHouse:master Nov 8, 2023
270 of 274 checks passed
@vitlibar vitlibar deleted the backup-use-two-more-thread-pools branch November 8, 2023 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-not-for-changelog This PR should not be mentioned in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants