Skip to content

fix: send upgrade action to units before adding it to bkgActions #9634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Draft

fix: send upgrade action to units before adding it to bkgActions #9634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions internal/pkg/agent/application/actions/handlers/handler_action_upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,9 @@ func (h *Upgrade) Handle(ctx context.Context, a fleetapi.Action, ack acker.Acker
return fmt.Errorf("invalid type, expected ActionUpgrade and received %T", a)
}

asyncCtx, runAsync := h.getAsyncContext(ctx, a, ack)
if !runAsync {
return nil
}

// first send the action to any units that need to know of it
// and only when there is no error add the action in the h.bkgActions
// (through getAsyncContext) so it can be invoked
if h.tamperProtectionFn() {
// Find inputs that want to receive UPGRADE action
// Endpoint needs to receive a signed UPGRADE action in order to be able to uncontain itself
Expand All @@ -73,6 +71,11 @@ func (h *Upgrade) Handle(ctx context.Context, a fleetapi.Action, ack acker.Acker
}
}

asyncCtx, runAsync := h.getAsyncContext(ctx, a, ack)
if !runAsync {
return nil
}

go func() {
h.log.Infof("starting upgrade to version %s in background", action.Data.Version)
if err := h.coord.Upgrade(asyncCtx, action.Data.Version, action.Data.SourceURI, action, false, false); err != nil {
Expand Down
Loading