fix rootless netns cleanup when PID file is empty#931
Open
yoonseo-han wants to merge 1 commit into
Open
Conversation
Treat an empty pasta PID file as a no-op during cleanup, preserve other parse errors, and join cleanup errors with errors.Join. Added unit tests Signed-off-by: Yoonseo Han <yooncer00@gmail.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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 podman-container-tools/podman#28441
Based on the previous PR #759
When pasta fails to start, it can leave an empty PID file behind. Rootless netns cleanup then tried to parse that file and failed, even though there was no process to clean up.
This change treats an empty or whitespace-only PID file as a no-op during cleanup, while still returning real parse errors. It also uses errors.Join when both the inner operation and cleanup fail, so both errors keep their type information.
Main fixes