23.3 Backport of #55119 - Fix deadlock in LDAP assigned role update - take 2#364
Merged
Enmk merged 5 commits intoFeb 21, 2024
Conversation
Collaborator
|
This is an automated comment for commit f5000c1 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
|
…ldap-role-update Fix deadlock in LDAP assigned role update
…gration-test Fix flaky LDAP integration tests
Fixed merge conflict from rebasing
2395e79 to
2195b38
Compare
…y::test_role_mapping
Member
Author
|
It looks like From my investigations, user's groups are updated properly inside |
Update of assigned roles (`GrantedRoles`) on `User` instance that occurs inside `LDAPAccessStorage` doesn't bubble up to `AccessStorate` and not broadcasted as an event to `AccessChangesNotifier` event handlers. Thus `AccessControl` that is held by `Context` never receives an event and is never updated, holding old instance of `User` with previous set of roles. `AccessControl` instances are cached for 600 seconds, so waiting for 600 + 10 seconds between sessions ensures that when user is logged in again, new `AccessControl` instance is created, and proper (updated `User`, with updated `GrantedRoles`) is created. This issue seems to be already fixed in upstream/master, but for now we are not going to backport it, just fix the test.
b3b191e to
f5000c1
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fix deadlock in LDAP assigned role update for non-existing ClickHouse roles (ClickHouse#55119 by @jmaicher, ClickHouse#56544 by @jmaicher)
re-doing incorrectly merged #353