libbeat/processors/translate_ldap_attribute: fix double locking and improve logging#47585
Merged
efd6 merged 3 commits intoelastic:mainfrom Nov 12, 2025
Merged
libbeat/processors/translate_ldap_attribute: fix double locking and improve logging#47585efd6 merged 3 commits intoelastic:mainfrom
efd6 merged 3 commits intoelastic:mainfrom
Conversation
efd6
added
enhancement
Filebeat
botelastic
bot
added
needs_team
Contributor
🤖 GitHub commentsJust comment with:
|
…mprove logging Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query.
efd6
force-pushed
the
s6615-ldap_logging
branch
from
9575505 to
4e14399
Compare
andrewkroh
reviewed
Nov 12, 2025
Contributor
|
Pinging @elastic/security-service-integrations (Team:Security-Service Integrations) |
Contributor
|
Pinging @elastic/sec-windows-platform (Team:Security-Windows Platform) |
andrewkroh
approved these changes
Nov 12, 2025
libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go
Outdated
Show resolved
Hide resolved
andrewkroh
approved these changes
Nov 12, 2025
marc-gr
approved these changes
Nov 12, 2025
Contributor
Author
|
/test |
efd6
changed the title
mergify bot
pushed a commit
that referenced
this pull request
Nov 12, 2025
…mprove logging (#47585) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257)
mergify bot
pushed a commit
that referenced
this pull request
Nov 12, 2025
…mprove logging (#47585) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257) # Conflicts: # libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go
mergify bot
pushed a commit
that referenced
this pull request
Nov 12, 2025
…mprove logging (#47585) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257)
This was referenced Nov 12, 2025
efd6
added a commit
that referenced
this pull request
Nov 12, 2025
…mprove logging (#47585) (#47592) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257) Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
efd6
added a commit
that referenced
this pull request
Nov 12, 2025
…mprove logging (#47585) (#47590) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257) Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
efd6
added a commit
that referenced
this pull request
Nov 12, 2025
…ix double locking and improve logging (#47591) * libbeat/processors/translate_ldap_attribute: fix double locking and improve logging (#47585) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257) # Conflicts: # libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go * resolve conflicts: this does not make use of the passed-in logger The 9.1 branch does not have the preferred behaviour, but the existing behaviour is retained to avoid conflating changes. --------- Co-authored-by: Dan Kortschak <dan.kortschak@elastic.co>
mergify bot
pushed a commit
that referenced
this pull request
Nov 18, 2025
…mprove logging (#47585) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query. (cherry picked from commit c2e6257) # Conflicts: # libbeat/processors/translate_ldap_attribute/translate_ldap_attribute.go
6 tasks
andrzej-stencel
pushed a commit
to andrzej-stencel/beats
that referenced
this pull request
Dec 1, 2025
…mprove logging (elastic#47585) Previously, when findObjectBy was called and the connection was closing, the reconnect method would both hold the lock and call connect which attempts to then gain the lock, resulting in a deadlock. Reduce the level of locking; I believe this can be reduced further, but the concurrent use protections here are unclear, so I have not gone further. Also improve debug logging during dial and query.
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
4 participants
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.
Proposed commit message
Checklist
stresstest.shscript to run them under stress conditions and race detector to verify their stability../changelog/fragmentsusing the changelog tool.Disruptive User Impact
Author's Checklist
How to test this PR locally
Related issues
Use cases
Screenshots
Logs