Skip to content

Improve restoring of access entities' dependencies#69346

Merged
vitlibar merged 4 commits intoClickHouse:masterfrom
vitlibar:restore-access-dependencies
Sep 17, 2024
Merged

Improve restoring of access entities' dependencies#69346
vitlibar merged 4 commits intoClickHouse:masterfrom
vitlibar:restore-access-dependencies

Conversation

@vitlibar
Copy link
Member

@vitlibar vitlibar commented Sep 6, 2024 •
edited
Loading

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

Improve restoring of access entities' dependencies.

For example if before making a backup a role was granted to a user:

CREATE USER u1;
CREATE ROLE r1;
GRANT r1 TO u1;

then during RESTORE the following cases are possible:

  1. User u1 and role r1 both don't exist. Then RESTORE will recreate them both and that grant too.
  2. User u1 and role r1 both exist. Then RESTORE (with default settings) will skip them both and that grant too.
  3. User u1 doesn't exist and role r1 exist. Then RESTORE (with default settings) will recreate user u1, and (after this PR) that grant too.
  4. User u1 exists and role r1 doesn't exist. Then RESTORE (with default settings) will recreate role r1, but without granting it to existing user u1. This case will be improved in separate PR Improve restoring of access entities' dependencies #2 #69563

@vitlibar vitlibar added the do not test disable testing on pull request label Sep 6, 2024
@robot-clickhouse robot-clickhouse added the pr-improvement Pull request with some product improvements label Sep 6, 2024
@robot-ch-test-poll3
Copy link
Contributor

robot-ch-test-poll3 commented Sep 6, 2024 •
edited by robot-clickhouse-ci-1
Loading

This is an automated comment for commit f768717 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
Bugfix validationChecks that either a new test (functional or integration) or there some changed tests that fail with the binary built on master branch❌ failure
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
BuildsThere's no description for the check yet, please add it to tests/ci/ci_config.py:CHECK_DESCRIPTIONS✅ success
ClickBenchRuns [ClickBench](https://github.com/ClickHouse/ClickBench/) with instant-attach table✅ 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. Integration 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
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
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

@vitlibar vitlibar changed the title Improve restoring access entities' dependencies Improve restoring of access entities' dependencies Sep 6, 2024
qoega
qoega reviewed Sep 10, 2024
View reviewed changes
@qoega qoega added pr-must-backport Pull request should be backported intentionally. Use this label with great care! pr-must-backport-cloud labels Sep 12, 2024
@vitlibar vitlibar force-pushed the restore-access-dependencies branch from ed656a6 to e2b69a7 Compare September 12, 2024 15:29
@vitlibar vitlibar removed the do not test disable testing on pull request label Sep 12, 2024
@vitlibar vitlibar marked this pull request as ready for review September 12, 2024 15:29
@vitlibar vitlibar mentioned this pull request Sep 12, 2024
Merged
@vitlibar vitlibar force-pushed the restore-access-dependencies branch from e2b69a7 to 0ead654 Compare September 13, 2024 08:26
@robot-clickhouse-ci-2 robot-clickhouse-ci-2 added pr-bugfix Pull request with bugfix, not backported by default and removed pr-improvement Pull request with some product improvements labels Sep 13, 2024
pufit
pufit approved these changes Sep 17, 2024
View reviewed changes
src/Access/IAccessStorage.cpp
for (auto & [id, entity] : my_entities)
{
UUID existing_entity_id;
if (!insert(id, entity, replace_if_exists, throw_if_exists, &existing_entity_id))
Copy link
Member

@pufit pufit Sep 17, 2024

Choose a reason for hiding this comment

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

It's sad that we have to change 20+ files just to have existing_entity_id returned from the insert, but I guess it works.

@vitlibar vitlibar added this pull request to the merge queue Sep 17, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Sep 17, 2024
@vitlibar vitlibar force-pushed the restore-access-dependencies branch from 0ead654 to f768717 Compare September 17, 2024 11:05
@vitlibar
Copy link
Member Author

vitlibar commented Sep 17, 2024

CI failure is wrong:

@vitlibar vitlibar added this pull request to the merge queue Sep 17, 2024
Merged via the queue into ClickHouse:master with commit fcda762 Sep 17, 2024
@vitlibar vitlibar deleted the restore-access-dependencies branch September 17, 2024 18:56
@robot-ch-test-poll1 robot-ch-test-poll1 added the pr-synced-to-cloud The PR is synced to the cloud repo label Sep 17, 2024
@robot-ch-test-poll4 robot-ch-test-poll4 mentioned this pull request Sep 17, 2024
Merged
robot-clickhouse added a commit that referenced this pull request Sep 17, 2024
@robot-clickhouse
Backport #69346 to 24.3: Improve restoring of access entities' depend…
19e8227 
…encies
This was referenced Sep 17, 2024
Closed
Merged
robot-clickhouse added a commit that referenced this pull request Sep 17, 2024
@robot-clickhouse
Backport #69346 to 24.6: Improve restoring of access entities' depend…
53c63fa 
…encies
This was referenced Sep 17, 2024
Closed
Merged
robot-clickhouse added a commit that referenced this pull request Sep 17, 2024
@robot-clickhouse
Backport #69346 to 24.7: Improve restoring of access entities' depend…
f7a803b 
…encies
This was referenced Sep 17, 2024
Merged
Merged
robot-clickhouse added a commit that referenced this pull request Sep 17, 2024
@robot-clickhouse
Backport #69346 to 24.8: Improve restoring of access entities' depend…
2c8eb11 
…encies
@robot-ch-test-poll4 robot-ch-test-poll4 mentioned this pull request Sep 17, 2024
Merged
@robot-ch-test-poll robot-ch-test-poll added pr-backports-created-cloud deprecated label, NOOP pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore labels Sep 17, 2024
robot-ch-test-poll3 added a commit that referenced this pull request Sep 27, 2024
@robot-ch-test-poll3
Merge pull request #69704 from ClickHouse/backport/24.8/69346
f6a4d80 
Backport #69346 to 24.8: Improve restoring of access entities' dependencies
robot-ch-test-poll2 added a commit that referenced this pull request Sep 27, 2024
@robot-ch-test-poll2
Merge pull request #69702 from ClickHouse/backport/24.7/69346
4bb2b45 
Backport #69346 to 24.7: Improve restoring of access entities' dependencies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@qoega qoega qoega left review comments

@pufit pufit pufit approved these changes

Assignees

@pufit pufit

Labels

pr-backports-created Backport PRs are successfully created, it won't be processed by CI script anymore pr-backports-created-cloud deprecated label, NOOP 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-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.

8 participants

@vitlibar @robot-ch-test-poll3 @qoega @pufit @robot-clickhouse @robot-ch-test-poll @robot-ch-test-poll1 @robot-clickhouse-ci-2