Repository navigation
Conversation
Accept the compatibility flag passed by containerd during CRIU restore. crun does not use a subreaper on this path, so the option has no effect, like it does for create and run. Also normalize the single-dash spelling in containerd's argv. Add a CLI regression test for both spellings. Closes: containers#2396 Signed-off-by: Eduard Zateev <hackerowskiy@gmail.com> Agent: Codex
giuseppe
reviewed
Oct 21, 2026
Comment on lines
+181
to
+183
| for (int i = 1; i < argc; i++) | ||
| if (strcmp (argv[i], "-no-subreaper") == 0) | ||
| argv[i] = "--no-subreaper"; |
Member
There was a problem hiding this comment.
it looks like a typo, better to fix it in containerd
Collaborator
|
it looks like a typo, better to fix it in containerd |
Member
I think we still need to treat |
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
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.
Summary
containerd passes
-no-subreapertocrun restoreduring CRIU restore. The command currently rejects the option and exits before restore can start.Accept both the standard
--no-subreaperspelling and the single-dash spelling sent by containerd. The option remains a no-op, consistent with crun's create and run commands. Add a CLI regression test for both spellings.Fixes #2396.
Testing
--disable-systemd --enable-werror.make clang-formatandgit diff --checkpassed.