Enhancement/5235 wrap errors when marking upgrade by kaanyalti · Pull Request #9366 · elastic/elastic-agent

kaanyalti · 2025-08-14T13:25:09Z

PR 4/6

Enhancement

What does this PR do?

Modifies the mark upgrade step to wrap errors so that the errors are propagated correctly.
Adds relevant tests, asserts that errors get propagated up the call chain.

Why is it important?

Errors are not propagated up the call chain in some instances, this prevents checking for error types.

Checklist

I have read and understood the pull request guidelines of this project.
My code follows the style guidelines of this project
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
~~[ ] I have added an entry in ./changelog/fragments using the changelog tool~~
~~[ ] I have added an integration test or an E2E test~~

Disruptive User Impact

none

How to test this PR locally

Run the ugprade_test and step_unpack_test tests

Related issues

elasticmachine · 2025-08-14T13:25:13Z

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

kaanyalti · 2025-08-15T14:37:56Z

~~The changelog fragment relevant to this PR is added in #9122~~
The changelog will be in a separate PR

kaanyalti · 2025-08-18T16:11:26Z

@blakerouse @michalpristas the pr is ready for review

mergify · 2025-09-09T01:17:05Z

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade upstream/enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade
git merge upstream/main
git push upstream enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade

elasticmachine · 2025-09-12T19:27:57Z

💛 Build succeeded, but was flaky

Buildkite Build
Commit: 1d7ff97

Failed CI Steps

x86_64:sudo: install-uninstall

History

💛 Build #26190 was flaky 3a0efec
💔 Build #26160 failed 432956e
💚 Build #25316 succeeded 3c97eb6
💛 Build #25294 was flaky df9dd27
💔 Build #25274 failed cb86100

cc @kaanyalti

…nt types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function

…nstall in upgrader, updated error handling tests to use these abstractions

elastic-sonarqube · 2025-09-13T16:09:41Z

Quality Gate passed

Issues
1 New issue
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
87.5% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

blakerouse

Looks good.

Nice testing.

kaanyalti · 2025-09-15T15:29:16Z

Looks good.

Nice testing.

Thank you!

github-actions · 2025-09-15T15:29:33Z

@Mergifyio backport 8.18 8.19 9.0 9.1

mergify · 2025-09-15T15:29:49Z

backport 8.18 8.19 9.0 9.1

✅ Backports have been created

Details

#9965 [8.18] (backport #9366) Enhancement/5235 wrap errors when marking upgrade has been created for branch 8.18 but encountered conflicts
#9966 [8.19] (backport #9366) Enhancement/5235 wrap errors when marking upgrade has been created for branch 8.19 but encountered conflicts
#9967 [9.0] (backport #9366) Enhancement/5235 wrap errors when marking upgrade has been created for branch 9.0
#9968 [9.1] (backport #9366) Enhancement/5235 wrap errors when marking upgrade has been created for branch 9.1

* enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink (cherry picked from commit 2e4e777) # Conflicts: # internal/pkg/agent/application/upgrade/step_mark.go # internal/pkg/agent/application/upgrade/step_mark_test.go # internal/pkg/agent/application/upgrade/upgrade.go # internal/pkg/agent/application/upgrade/upgrade_test.go

* enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink (cherry picked from commit 2e4e777) # Conflicts: # internal/pkg/agent/application/upgrade/step_mark.go # internal/pkg/agent/application/upgrade/step_mark_test.go

* enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink (cherry picked from commit 2e4e777)

* enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink (cherry picked from commit 2e4e777) Co-authored-by: Kaan Yalti <kaan.yalti@elastic.co>

…rade (#9966) * Enhancement/5235 wrap errors when marking upgrade (#9366) * enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink (cherry picked from commit 2e4e777) # Conflicts: # internal/pkg/agent/application/upgrade/step_mark.go # internal/pkg/agent/application/upgrade/step_mark_test.go * resolved conflicts * removed unnecessary tests * removed unused param --------- Co-authored-by: Kaan Yalti <kaan.yalti@elastic.co>

* upstream: (26 commits) fix: ensure EDOT subprocess shuts down gracefully on agent termination (#9886) [main][Automation] Update versions (#9976) Add Collector reference docs and automation (#9953) [beatreceivers] Integrate beatsauthextension (#9257) [main][Automation] Update versions (#9941) Update OTel components to v0.132.0/v1.38.0 (#9954) Enhancement/5235 wrap errors when marking upgrade (#9366) Mount Go build cache into crossbuild container (#9094) Liveness agent state (#9673) [main][Automation] Bump VM Image version to 1757725254 (#9942) Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory (#9349) [main][Automation] Update elastic/beats to afc53c0479ac (#9874) Add -coverpkg option when running unit test to calculate coverage across packages (#9913) Cache binaries downloaded for packaging locally (#9133) [main][Automation] Update versions (#9897) Disable flaky test TestBeatsReceiverLogs (#9891) Allow overriding AGENT_PACKAGE_VERSION and MANIFEST_URL when USE_PACKAGE_VERSION=true (#9864) add ingest-docs team as CODEOWNERS for release notes and docset.yml (#9865) fix: correct spelling of 'output' in various templates and monitoring code (#9827) k8s: Add comment around hostUsers for Universal Profiling deployments (#9847) ...

…rade (#9965) * Enhancement/5235 wrap errors when marking upgrade (#9366) * enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink (cherry picked from commit 2e4e777) # Conflicts: # internal/pkg/agent/application/upgrade/step_mark.go # internal/pkg/agent/application/upgrade/step_mark_test.go # internal/pkg/agent/application/upgrade/upgrade.go # internal/pkg/agent/application/upgrade/upgrade_test.go * resolve conflicts * removed unused tests * removed unused var --------- Co-authored-by: Kaan Yalti <kaan.yalti@elastic.co>

* enhancement(5235): added markUpgradeFunc to abstract markUpgrade * enhancement(5235): using markUpgradeFunc in Upgrade function * enhancement(5235): wrapping writeFile errors in markUpgrade enhancement(5235): added goerrors in step_mark * enhancement(5235): using writeFile wrapper in markUpgrade * enhancement(5235): added tests mark upgrade tests enhancement(5235): updated step mark test to mock writeFile * enhancement(5235): updated markUpgrade function so that it can be tested, jecting dependencies. updated relevant tests * enhancement(5235): updated use of markUpgrade in rollback and rollback tests * enhancement(5235): abstracted markupgrade from upgrader, added relevant types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function * enhancement(5235): added abstractions for changesymlink and rollbackInstall in upgrader, updated error handling tests to use these abstractions * enhancement(5235): added error handling test for changesymlink

kaanyalti requested a review from a team as a code owner August 14, 2025 13:25

kaanyalti added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Aug 14, 2025

kaanyalti requested review from blakerouse and michalpristas August 14, 2025 13:25

kaanyalti added the backport-active-all Automated backport with mergify to all the active branches label Aug 14, 2025

mergify bot assigned kaanyalti Aug 14, 2025

kaanyalti force-pushed the enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade branch from cb86100 to 269f22c Compare August 14, 2025 16:45

kaanyalti mentioned this pull request Aug 14, 2025

Enhancement/5235 insufficient disk handling retry shows underlying error #9122

Merged

6 tasks

kaanyalti commented Aug 14, 2025

View reviewed changes

Comment thread internal/pkg/agent/application/upgrade/common/stdlib_wrappers.go Outdated

kaanyalti force-pushed the enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade branch 2 times, most recently from df9dd27 to 3c97eb6 Compare August 15, 2025 14:01

This was referenced Aug 15, 2025

Enhancement/5235 upgrade cleans up downloads and extracted agent #9386

Merged

Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory #9349

Merged

michalpristas reviewed Aug 19, 2025

View reviewed changes

Comment thread internal/pkg/agent/application/upgrade/upgrade.go Outdated

kaanyalti marked this pull request as draft September 2, 2025 13:05

kaanyalti force-pushed the enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade branch 3 times, most recently from 3a0efec to 689e85d Compare September 8, 2025 15:41

kaanyalti changed the title ~~Enhancement/5235 handle insufficient disk space when marking upgrade~~ Enhancement/5235 wrap errors when marking upgrade Sep 9, 2025

kaanyalti force-pushed the enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade branch from 689e85d to 1d7ff97 Compare September 12, 2025 17:20

mergify bot mentioned this pull request Sep 12, 2025

[8.18] (backport #9349) Enhancement/5235 correctly wrap errors from copyActionDir and copyRunDirectory #9933

Merged

4 tasks

Kaan Yalti added 3 commits September 13, 2025 17:31

enhancement(5235): abstracted markupgrade from upgrader, added releva…

923ee3f

…nt types and updated the upgrader struct. added tests case for mark upgrade error handling in the upgrade function

enhancement(5235): added abstractions for changesymlink and rollbackI…

3703976

…nstall in upgrader, updated error handling tests to use these abstractions

enhancement(5235): added error handling test for changesymlink

bbca4d9

kaanyalti force-pushed the enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade branch from 1d7ff97 to bbca4d9 Compare September 13, 2025 14:32

kaanyalti marked this pull request as ready for review September 14, 2025 20:56

kaanyalti requested a review from michalpristas September 15, 2025 12:04

blakerouse approved these changes Sep 15, 2025

View reviewed changes

kaanyalti merged commit 2e4e777 into elastic:main Sep 15, 2025
23 checks passed

mergify bot mentioned this pull request Sep 15, 2025

[8.18] (backport #9366) Enhancement/5235 wrap errors when marking upgrade #9965

Merged

4 tasks

This was referenced Sep 15, 2025

[8.19] (backport #9366) Enhancement/5235 wrap errors when marking upgrade #9966

Merged

[9.0] (backport #9366) Enhancement/5235 wrap errors when marking upgrade #9967

Merged

mergify bot mentioned this pull request Sep 15, 2025

[9.1] (backport #9366) Enhancement/5235 wrap errors when marking upgrade #9968

Merged

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Enhancement/5235 wrap errors when marking upgrade#9366

Enhancement/5235 wrap errors when marking upgrade#9366
kaanyalti merged 10 commits intoelastic:mainfrom
kaanyalti:enhancement/5235_handle_insufficient_disk_space_when_marking_upgrade

kaanyalti commented Aug 14, 2025 •

edited

Loading

Uh oh!

elasticmachine commented Aug 14, 2025

Uh oh!

Uh oh!

kaanyalti commented Aug 15, 2025 •

edited

Loading

Uh oh!

kaanyalti commented Aug 18, 2025

Uh oh!

Uh oh!

mergify bot commented Sep 9, 2025

Uh oh!

elasticmachine commented Sep 12, 2025

Uh oh!

elastic-sonarqube bot commented Sep 13, 2025

Uh oh!

blakerouse left a comment

Uh oh!

kaanyalti commented Sep 15, 2025

Uh oh!

Uh oh!

github-actions bot commented Sep 15, 2025

Uh oh!

mergify bot commented Sep 15, 2025 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

kaanyalti commented Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR do?

Why is it important?

Checklist

Disruptive User Impact

How to test this PR locally

Related issues

Uh oh!

elasticmachine commented Aug 14, 2025

Uh oh!

Uh oh!

kaanyalti commented Aug 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kaanyalti commented Aug 18, 2025

Uh oh!

Uh oh!

mergify bot commented Sep 9, 2025

Uh oh!

elasticmachine commented Sep 12, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

History

Uh oh!

elastic-sonarqube bot commented Sep 13, 2025

Quality Gate passed

Uh oh!

blakerouse left a comment

Choose a reason for hiding this comment

Uh oh!

kaanyalti commented Sep 15, 2025

Uh oh!

Uh oh!

github-actions bot commented Sep 15, 2025

Uh oh!

mergify bot commented Sep 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Backports have been created

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kaanyalti commented Aug 14, 2025 •

edited

Loading

kaanyalti commented Aug 15, 2025 •

edited

Loading

mergify bot commented Sep 15, 2025 •

edited

Loading