[9.0] (backport #9634) fix: send upgrade action to units before adding it to bkgActions #9861
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?
This PR refactors the
Coordinator.UpgradeAPI to use functional options (UpgradeOpt) instead of long argument lists, and introduces apreUpgradeCallback.Specifically:
Coordinator.Upgradeto make the flow more consistent (e.g. first verifying that the coordinator is not already upgrading before continuing).All business logic changes are captured here bcdba7b (+90 -29 lines changed)
Why is it important?
Currently, upgrade actions can remain stuck in
bkgActionswhen tamper protection is enabled (see #9629). This occurs because errors returned from the Endpoint action proxying are not correctly handled, leaving stale entries behind.By moving this logic into a
preUpgradeCallback, any error from proxying is now surfaced through the coordinator’s upgrade flow, which ensures thatbkgActionsare cleaned up correctly.I am not fully satisfied with these changes — they are a pragmatic fix until we perform a larger rewrite to centralize upgrade action handling in a single place. Still, they are necessary to resolve the immediate issue of stuck upgrade actions.
Checklist
./changelog/fragmentsusing the changelog toolDisruptive User Impact
None expected - this change only affects the internal proxying of upgrade actions to Endpoint and does not alter the upgrade request API.
How to test this PR locally
Related issues
This is an automatic backport of pull request fix: send upgrade action to units before adding it to bkgActions #9634 done by Mergify.