cmd-coreos-prune: fix skipping of images action #4021
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
jlebon
reviewed
Feb 10, 2025
src/cmd-coreos-prune
Outdated
| if action != "images": | ||
| print(f"\t\tBuild {build_id} has already had {action} pruning completed") | ||
| continue | ||
| print(f"action {action} is in previous cleanup section") |
There was a problem hiding this comment.
Leftover? Seems redundant with the next print statement.
There was a problem hiding this comment.
I think it was part of my debugging - will drop it.
| if e.response['Error']['Code'] == 'NoSuchKey': | ||
| print(f"\t\t\t{bucket}/{image_prefix} already pruned.") | ||
| else: | ||
| errors.append(e) |
There was a problem hiding this comment.
Hmm, feels like it's still worth a comment somewhere in this area that the API returns 204 in the ENOENT case (and/or link to the docs page). As someone reviewing this code, I wouldn't have guessed that so my first thought would've been that it's a bug.
This detection wasn't working properly and causing the `images` action to get run even for builds where the images had already been pruned.
Apparently delete object won't return a NoSuchKey error if the object doesn't exist. I stumbled upon this because our handling for the images action meant we were calling prune_images() even for builds that had already had images pruned and the logs were telling me it was deleting the images again when it should have been telling me ``` XYZ.vmdk already pruned ``` Turns out the delete_object returns a `204 Success (No Content)` response when the key doesn't exist. https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObject.html#API_DeleteObject_RequestSyntax Let's just delete this code in here since it's dead code and can be confusing to future code readers. The prior commit to this one will try to ensure we don't end up in this code path if the images have already been pruned for a build.
jlebon
approved these changes
Feb 10, 2025
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.
This detection wasn't working properly and causing the
imagesaction to get run even for builds where the images had already been pruned.