-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
Add runc_nocriu
build tag to opt out of c/r
#4546
Merged
+100
−63
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
//go:build runc_nocriu | ||
|
||
package libcontainer | ||
|
||
import "errors" | ||
|
||
var ErrNoCR = errors.New("this runc binary has not been compiled with checkpoint/restore support enabled (runc_nocriu)") | ||
|
||
func (c *Container) Restore(process *Process, criuOpts *CriuOpts) error { | ||
return ErrNoCR | ||
} | ||
|
||
func (c *Container) Checkpoint(criuOpts *CriuOpts) error { | ||
return ErrNoCR | ||
} |
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it possible to also move the
CriuPageServerInfo
stuff fromcheckpoint.go
so we can mark this file as//go:build !runc_nocr
as well? I guess it doesn't matter for the size of the final binary, but it is a little odd to keep this even withrunc_nocr
.Actually, would it be possible to move
criuOptions
to a!runc_nocr
file, or would that be too difficult?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did that initially, but when I realized that
runc checkpoint
andrunc restore
commands should be kept intact, so when a user runs those, they see a useful error like "c/r not compiled in" rather thanNo help topic for 'checkpoint'
(which is urfave/cli way to say no such command).Same for all the checkpoint/restore options: I kept those so that a valid command like
runc checkpoint --leave-running XXX
results in a useful "c/r not compiled in" error rather than "flag provided but not defined: -leave-running`.In order to keep both commands and their options, we have to keep the data structures, too. We're lucky there aren't that many.
Sure, we can duplicate the whole thing with commands and options but without data structures, but that would be a mere duplication.
So, for the sake of both simplicity and user experience I keep all the CLI parsing (and the associated data structures) in place. Hope it makes sense.