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

Significant improvement of rust caching #52865

Merged
merged 6 commits into from
Aug 11, 2023
Merged

Conversation

Felixoid
Copy link
Member

@Felixoid Felixoid commented Aug 1, 2023

Changelog category (leave one):

  • Not for changelog (changelog entry is not required)

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

Follow-up for #52395. Cargo packages are now stored in S3 as a single archive per rust/Cargo.lock version. As well now rust is building with using of sccache.

@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added the pr-not-for-changelog This PR should not be mentioned in the changelog label Aug 1, 2023
@robot-clickhouse-ci-2
Copy link
Contributor

robot-clickhouse-ci-2 commented Aug 1, 2023

This is an automated comment for commit dcb1d3e 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
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
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🔴 failure
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🟢 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🔴 failure

@Felixoid Felixoid force-pushed the restructure-docker-rust branch 6 times, most recently from 5a5e720 to bcd3d10 Compare August 7, 2023 11:41
@Felixoid
Copy link
Member Author

Felixoid commented Aug 7, 2023

Since there aren't objections, I am going to merge it after successful builds.

@Felixoid Felixoid marked this pull request as draft August 9, 2023 21:11
@Felixoid
Copy link
Member Author

Felixoid commented Aug 9, 2023

The plan here is to implement the same scheme as it was for ccache, details are here #53060 (comment)

@Felixoid Felixoid marked this pull request as ready for review August 10, 2023 17:15
@Felixoid Felixoid force-pushed the restructure-docker-rust branch 2 times, most recently from a7df94c to 3a85a9d Compare August 10, 2023 19:09
@Felixoid Felixoid changed the title Move rust to docker/packager/binary, revert docker_image_check tar changes Remove cargo vendoring from docker image, store it in S3 Aug 10, 2023
@Felixoid Felixoid changed the title Remove cargo vendoring from docker image, store it in S3 Significant improvement of rust caching Aug 10, 2023
@Felixoid Felixoid added pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud labels Aug 10, 2023
@Felixoid
Copy link
Member Author

The implemented solution is much simpler than the previous one.

The cargo cache is now stored in S3 in a single instance, and should be downloaded and uploaded much faster than previously.

@Felixoid
Copy link
Member Author

The tests must finish, there are many changes in global things like S3 and de-/compressing

@Felixoid
Copy link
Member Author

@azat I need assistant to backport it

As far as I get, I need to remove existing Cargo.lock in subdirs, add the config https://github.com/ClickHouse/ClickHouse/blob/master/rust/Cargo.toml, and edit it accordingly to the repository state. What's then? invoke cargo generate-lockfile in the rust/ directory?

@azat
Copy link
Collaborator

azat commented Aug 12, 2023

As far as I get, I need to remove existing Cargo.lock in subdirs, add the config master/rust/Cargo.toml, and edit it accordingly to the repository state. What's then? invoke cargo generate-lockfile in the rust/ directory?

More or less, but there are some trickiness, see below.

cd rust
cp /path/to/upstream/rust/Cargo.toml ./
rm */Cargo.lock
# then you need to pin versions in the */Cargo.toml strictly, i.e. not 'foo = "0.1"' but 'foo = "=0.1"'
# otherwise vendor make download different version and to decrease amount of changes
cargo generate-lockfile
cargo vendor # to check that it works
ninja -v cargo-build__ch_rust_blake3 cargo-build__ch_rust_skim_rust cargo-build__ch_rust_prql # this is required to ensure that vendored versions are correct, due to the tricky step with replacing versions in Cargo.toml
git checkout */Cargo.toml # revert this changes

Actually maybe the last command it extra and we need to pin the version, but let me take a look at it this separately, definitely it should not be a part of backports.

@Felixoid
Copy link
Member Author

thanks, but it's indeed too much work to try to backport it

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-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud 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

4 participants