[9.3] (backport #12225) Report app lock errors correctly#12233
Merged
Conversation
If we failed to get the app lock, we wouldn't emit the underlying error. (cherry picked from commit a44ff92)
mergify
bot
requested review from
blakerouse and
ycombinator
and removed request for
a team
3 tasks
github-actions
bot
added
bug
Contributor
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
swiatekm
approved these changes
Jan 14, 2026
Contributor
💔 Build Failed
Failed CI Steps
History
cc @swiatekm |
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
2 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.
What does this PR do?
Ensures we emit the underlying error if we fail to acquire the app lock. Before, we'd erroneously just put
nilin there.Why is it important?
We should always report the underlying error, as it helps with troubleshooting.
Checklist
[ ] I have commented my code, particularly in hard-to-understand areas[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files[ ] I have added tests that prove my fix is effective or that my feature works./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testHow to test this PR locally
Run two agents concurrently from the same data directory. You should get:
Before this change, it's:
This is an automatic backport of pull request #12225 done by [Mergify](https://mergify.com).