Skip to content
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.

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

Use named return values in WriteAtomically #2235

Merged
merged 1 commit into from
Oct 7, 2022

Conversation

twz123
Copy link
Member

@twz123 twz123 commented Oct 7, 2022

Description

The intention was to use a named return value, so that the deferred function would be able to modify it. Without the named value, the error handling in the deferred function has no effect.

Moreover: Add a bunch of tests and suppress any errors about failed removals of temporary files indicating that the files don't exist.

Fixes #1816.

The tests should've been added in the first PR already, but sometimes we can't help being a little sloppy 🙈

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update

How Has This Been Tested?

  • Manual test
  • Auto test added

Checklist:

  • My code follows the style guidelines of this project
  • My commit messages are signed-off
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings

@twz123 twz123 added the bug Something isn't working label Oct 7, 2022
@twz123 twz123 marked this pull request as ready for review October 7, 2022 08:25
@twz123 twz123 requested a review from a team as a code owner October 7, 2022 08:25
@twz123 twz123 requested review from ncopa and s0j October 7, 2022 08:25
@twz123 twz123 marked this pull request as draft October 7, 2022 08:51
The intention was to use a named return value, so that the deferred
function would be able to modify it. Without the named value, the error
handling in the deferred function has no effect.

Moreover: Add a bunch of tests and suppress any errors about failed
removals of temporary files indicating that the files don't exist.

Fixes: 8ea5626 ("Write manifests atomically")
Signed-off-by: Tom Wieczorek <[email protected]>
@twz123 twz123 marked this pull request as ready for review October 7, 2022 12:08
@twz123 twz123 enabled auto-merge October 7, 2022 12:32
@twz123 twz123 merged commit ff43991 into k0sproject:main Oct 7, 2022
@twz123 twz123 deleted the fix-atomic-write branch October 14, 2022 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants