Skip to content

Add skip-in-flight and link-remap criu options for checkpoint and restore #4627

Merged
rata merged 1 commit into
opencontainers:mainfrom
beam-cloud:main
Feb 26, 2025
Merged

Add skip-in-flight and link-remap criu options for checkpoint and restore #4627
rata merged 1 commit into
opencontainers:mainfrom
beam-cloud:main

Conversation

@dleviminzi
Copy link
Copy Markdown
Contributor

@dleviminzi dleviminzi commented Feb 13, 2025

This is a relatively small PR that exposes the criu options below when using the runc checkpoint and restore functionality.

--tcp-skip-in-flight
: Skip in-flight TCP connections. See
criu --skip-in-flight option.

--link-remap
: Allow one to link unlinked files back when possible. See
criu --link-remap option.

With regards to the lint error below, I followed the naming convention of the already present TcpEstablished when adding TcpSkipInFlight. I could leave it as it or change both or change just my addition. Though the last option would look a bit weird I think.

@kolyshkin
Copy link
Copy Markdown
Contributor

Hmm, if I'm not mistaken, both options are for checkpoint only.

@dleviminzi
Copy link
Copy Markdown
Contributor Author

Hmm, if I'm not mistaken, both options are for checkpoint only.

I've removed those options from restore.

@kolyshkin
Copy link
Copy Markdown
Contributor

@dleviminzi can you squash the commits please?

@dleviminzi
Copy link
Copy Markdown
Contributor Author

@dleviminzi can you squash the commits please?

No problem, just did.

Copy link
Copy Markdown
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (and I think we can ignore linter-extra warning here).

@kolyshkin kolyshkin added this to the 1.3.0-rc.1 milestone Feb 25, 2025
Signed-off-by: Daniel Levi-Minzi <dleviminzi@gmail.com>
@kolyshkin
Copy link
Copy Markdown
Contributor

@opencontainers/runc-maintainers PTAL

Copy link
Copy Markdown
Member

@rata rata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

Cool that the current criurpc version we are using already has those fields present, so this patch is quite simple :)

It seems ok to keep the warning for now, we can fix it in another PR if we want to.

@rata rata merged commit 8c72dfa into opencontainers:main Feb 26, 2025
@rata rata mentioned this pull request Mar 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants