ngclient updater: clean temp file if write fails #1757
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
Pull Request Test Coverage Report for Build 1682855792
💛 - Coveralls |
|
Looks good to me. Probably adding one more assert that the file doesn't exist? |
MVrachev
commented
Jan 6, 2022
MVrachev
force-pushed
the
persistent-tmp-file-cleaning
branch
from
3e34b0e
to
8008329
Compare
Yep, maybe you are correct that this way the test will be more complete. |
jku
reviewed
Jan 7, 2022
MVrachev
force-pushed
the
persistent-tmp-file-cleaning
branch
3 times, most recently
from
95d5d9f
to
3f4458f
Compare
|
Updated the pr with @jku suggestions. |
|
The CI failure is fixed in #1762. |
jku
approved these changes
Jan 11, 2022
When calling updater._persist_metadata() there is a possibility that writing the temporary file to storage can succeed, but moving it with os.replace could fail with OSError. Make sure we are removing the newly created temporary file in that case. Signed-off-by: Martin Vrachev <mvrachev@vmware.com>
MVrachev
force-pushed
the
persistent-tmp-file-cleaning
branch
from
3f4458f
to
6f91da6
Compare
I tried adding a new test patching |
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.
Fixes #1575
Description of the changes being introduced by the pull request:
When calling updater._persist_metadata() there is a possibility that
writing the temporary file to storage can succeed, but moving it with
os.replacecould fail with OSError.Make sure we are removing the newly created temporary file in that case.
I tried testing the first case described in the issue, but I had troubles
mocking
writeas it was notos.write().Signed-off-by: Martin Vrachev mvrachev@vmware.com
Please verify and check that the pull request fulfills the following
requirements: