Fix state store SetAction panic #5438
Merged
Conversation
This file contains 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
|
Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
7facba4 to
4f67b2a
Compare
The state store SetAction did not correctly cover the case where a nil action is passed as parameter. The unenroll handler might pass a nil action if the unenroll is a auto-unenroll, that means, it does not come from fleet Also the unenroll handler does checks for a nil state store anymore, it assumes it's valid just as it does for all other dependencies.
e9ddfec to
9cd34bc
Compare
pchila
reviewed
Sep 6, 2024
AndersonQ
commented
Sep 6, 2024
| @@ -92,12 +92,10 @@ func (h *Unenroll) Handle(ctx context.Context, a fleetapi.Action, acker acker.Ac | |||
| unenrollPolicy := newPolicyChange(ctx, config.New(), a, acker, true) | |||
| h.ch <- unenrollPolicy | |||
|
|
|||
| if h.stateStore != nil { | |||
There was a problem hiding this comment.
It seems to have been used just to test the handler without a state store, which is one of the reasons the panic was not caught
…stic-agent into 5434-fix-state-store-panic
pchila
approved these changes
Sep 6, 2024
|
mergify bot
pushed a commit
that referenced
this pull request
Sep 6, 2024
* fix state store SetAction panic The state store SetAction did not correctly cover the case where a nil action is passed as parameter. The unenroll handler might pass a nil action if the unenroll is a auto-unenroll, that means, it does not come from fleet Also the unenroll handler does checks for a nil state store anymore, it assumes it's valid just as it does for all other dependencies. (cherry picked from commit c113a26)
mergify bot
pushed a commit
that referenced
this pull request
Sep 6, 2024
* fix state store SetAction panic The state store SetAction did not correctly cover the case where a nil action is passed as parameter. The unenroll handler might pass a nil action if the unenroll is a auto-unenroll, that means, it does not come from fleet Also the unenroll handler does checks for a nil state store anymore, it assumes it's valid just as it does for all other dependencies. (cherry picked from commit c113a26)
This was referenced Sep 6, 2024
AndersonQ
added a commit
that referenced
this pull request
Sep 12, 2024
* fix state store SetAction panic The state store SetAction did not correctly cover the case where a nil action is passed as parameter. The unenroll handler might pass a nil action if the unenroll is a auto-unenroll, that means, it does not come from fleet Also the unenroll handler does checks for a nil state store anymore, it assumes it's valid just as it does for all other dependencies. (cherry picked from commit c113a26) Co-authored-by: Anderson Queiroz <anderson.queiroz@elastic.co>
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.
The state store SetAction did not correctly cover the case where a nil action is passed as parameter. The unenroll handler might pass a nil action if the unenroll is a auto-unenroll, that means, it does not come from fleet
Also the unenroll handler does checks for a nil state store anymore, it assumes it's valid just as it does for all other dependencies
What does this PR do?
Fixes the state store panicking when receiving an
nilactionWhy is it important?
Panic is bad, the agent should not panic
Also the unenroll handler sets an
nilaction on the state store if the unenroll is self-inflicted. The agent auto unenroll after the 7th authentication failure against fleet.Checklist
[ ] I have made corresponding changes to the documentation[ ] I have made corresponding change to the default configuration files./changelog/fragmentsusing the changelog tool[ ] I have added an integration test or an E2E testDisruptive User Impact
How to test this PR locally
run the tests added on the PR, all work
keep the tests, rever the changes on the state store, they will panic
Related issues
nilaction #5434Questions to ask yourself