Skip to content

[autobackport: sssd-2-9] sbus: defer notification callbacks#8265

Merged
alexey-tikhonov merged 3 commits intoSSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8202-to-sssd-2-9
Dec 16, 2025
Merged

[autobackport: sssd-2-9] sbus: defer notification callbacks#8265
alexey-tikhonov merged 3 commits intoSSSD:sssd-2-9from
sssd-bot:SSSD-sssd-backport-pr8202-to-sssd-2-9

Conversation

@sssd-bot
Copy link
Contributor

@sssd-bot sssd-bot commented Dec 4, 2025

This is an automatic backport of PR#8202 sbus: defer notification callbacks to branch sssd-2-9, created by @pbrezina.

Caution

@pbrezina The patches did not apply cleanly. It is necessary to resolve conflicts before merging this pull request. Commits that introduced conflict are marked with CONFLICT!.

You can push changes to this pull request

git remote add sssd-bot git@github.com:sssd-bot/sssd.git
git fetch sssd-bot refs/heads/SSSD-sssd-backport-pr8202-to-sssd-2-9
git checkout SSSD-sssd-backport-pr8202-to-sssd-2-9
git push sssd-bot SSSD-sssd-backport-pr8202-to-sssd-2-9 --force

Original commits
d6ea555 - sbus: defer notification callbacks
816eb1e - cache_req: allow cache_first mode only if there is more than one domain
00547f6 - tests: filter_groups by name and lookup by id with expired cache

Backported commits

  • 36801d2 - sbus: defer notification callbacks
  • d2035bf - cache_req: allow cache_first mode only if there is more than one domain
  • 0dea868 - CONFLICT! tests: filter_groups by name and lookup by id with expired cache

Conflicting Files Information (check for deleted and re-added files)

  • CONFLICT! tests: filter_groups by name and lookup by id with expired cache
On branch SSSD-sssd-backport-pr8202-to-sssd-2-9
You are currently cherry-picking commit 00547f67a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/tests/system/tests/test_identity.py

no changes added to commit (use "git add" and/or "git commit -a")```

---

**Original Pull Request Body**

Otherwise, it is possible to incorrectly chain nested requests since the
chain id is still present in the hash table.

Resolves: https://github.com/SSSD/sssd/issues/8194

gemini-code-assist[bot]
gemini-code-assist bot reviewed Dec 4, 2025
View reviewed changes
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request backports several changes, including deferring sbus notification callbacks to prevent issues with nested requests and refining the cache_first logic in cache_req. The C code changes appear correct and well-implemented. However, the test file src/tests/system/tests/test_identity.py has unresolved merge conflicts that must be fixed before this pull request can be merged. I have left a specific comment on the file.

@alexey-tikhonov alexey-tikhonov added Changes requested no-backport This should go to target branch only. Bugzilla labels Dec 4, 2025
@alexey-tikhonov
Copy link
Member

alexey-tikhonov commented Dec 4, 2025

RHBZ: https://issues.redhat.com/browse/RHEL-133469

@pbrezina pbrezina force-pushed the SSSD-sssd-backport-pr8202-to-sssd-2-9 branch from 0dea868 to 17bd2b6 Compare December 4, 2025 12:45
@pbrezina pbrezina marked this pull request as ready for review December 4, 2025 12:45
@alexey-tikhonov
Copy link
Member

alexey-tikhonov commented Dec 5, 2025 

tests/test_identity.py:687: in <module>
    @pytest.mark.topology(KnownTopology.LDAP)
                          ^^^^^^^^^^^^^
E   NameError: name 'KnownTopology' is not defined

KnownTopology wasn't backported (yet?)
Funny thing is that this missing backport (or, to be precise, missing patch that applies this marker to a bunch of tests) helped to catch a regression introduced by "gid=0" removal.

@alexey-tikhonov alexey-tikhonov mentioned this pull request Dec 5, 2025
Merged
@alexey-tikhonov
Copy link
Member

alexey-tikhonov commented Dec 16, 2025

@pbrezina, ping

@pbrezina pbrezina force-pushed the SSSD-sssd-backport-pr8202-to-sssd-2-9 branch 3 times, most recently from 50cf3e8 to 11850b4 Compare December 16, 2025 12:04
@alexey-tikhonov alexey-tikhonov removed the request for review from thalman December 16, 2025 12:58
@pbrezina @sssd-bot
sbus: defer notification callbacks
883cf50 
Otherwise, it is possible to incorrectly chain nested requests since the
chain id is still present in the hash table.

Resolves: SSSD#8194
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
(cherry picked from commit d6ea555)
@pbrezina @sssd-bot
cache_req: allow cache_first mode only if there is more than one domain
d438b7c 
Otherwise we will perform unnecessary data provider lookups.

Resolves: SSSD#8194
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
(cherry picked from commit 816eb1e)
@pbrezina @sssd-bot
tests: filter_groups by name and lookup by id with expired cache
c4e4c61 
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
Reviewed-by: Tomáš Halman <thalman@redhat.com>
(cherry picked from commit 00547f6)
@sssd-bot
Copy link
Contributor Author

sssd-bot commented Dec 16, 2025

The pull request was accepted by @alexey-tikhonov with the following PR CI status:

🟢 CodeQL (success)
🟢 rpm-build:centos-stream-9-x86_64:upstream (success)
🟢 Build / make-distcheck (success)
🟢 ci / prepare (success)
🟢 ci / system (centos-9) (success)
🟢 Static code analysis / codeql (success)
🟢 Static code analysis / pre-commit (success)
🟢 Static code analysis / python-system-tests (success)

There are unsuccessful or unfinished checks. Make sure that the failures are not related to this pull request before merging.

@sssd-bot sssd-bot force-pushed the SSSD-sssd-backport-pr8202-to-sssd-2-9 branch from 11850b4 to c4e4c61 Compare December 16, 2025 15:02
@alexey-tikhonov alexey-tikhonov merged commit 6196567 into SSSD:sssd-2-9 Dec 16, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexey-tikhonov alexey-tikhonov alexey-tikhonov approved these changes

+1 more reviewer

@gemini-code-assist gemini-code-assist[bot] gemini-code-assist[bot] left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@alexey-tikhonov alexey-tikhonov

Labels

Accepted Bugzilla no-backport This should go to target branch only.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@sssd-bot @alexey-tikhonov @thalman @pbrezina