Add --file-locks checkpoint/restore option

[rst0git]

What this PR does / why we need it:

CRIU supports checkpoint/restore of file locks. This feature is required to checkpoint/restore containers running applications such MySQL.

How to verify it?

sudo podman run --name some-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql:latest

sudo podman container checkpoint --file-locks some-mysql

[TomSweeneyRedHat]

Quick review LGTM, but you'll need to update the man pages with the new option before the CI will let this get through.

[edsantiago]

Very quick review: you need to remove -l and resubmit (or, alternately, skip if remote).

[edsantiago]

Some minor suggestions (on the tests only; I don't feel qualified to comment on the rest).

Please hold off on re-pushing: all of CI is currently broken. There's a fix in progress, but you may need to rebase on main once that's in. Sorry for the inconvenience.

[edsantiago]

Flake is a combination of #12273 and #12306. Restarting.

[edsantiago]

Other CI failures are real:

Running: podman [options] container restore e6b6a148e5d9abfe053ce8bc0d93d3e2fcef1790e4d4f2a7773ab691d65609f7
Error: OCI runtime error: restore: unrecognized option '--file-locks'

[rst0git]

Other CI failures are real:

Running: podman [options] container restore e6b6a148e5d9abfe053ce8bc0d93d3e2fcef1790e4d4f2a7773ab691d65609f7
Error: OCI runtime error: restore: unrecognized option '--file-locks'

Thanks, this should be fixed now.

[edsantiago]

LGTM. @containers/podman-maintainers PTAL

[umohnani8]

LGTM

[edsantiago]

Aw, phooey. @rst0git there's a merge conflict, looks like #12342

[rst0git]

Aw, phooey. @rst0git there's a merge conflict, looks like #12342

Thanks, I've rebased the branch.

[mheon]

@adrianreber Mind doing a quick review?

Code LGTM

[rhatdan]

/approve
/lgtm
Thanks @rst0git

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago, rhatdan, rst0git

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [edsantiago,rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[adrianreber]

@adrianreber Mind doing a quick review?

Code LGTM

I am too late, but looks good. One thing, however, shouldn't there be a check if the runtime actually supports --file-locks? There is a PR referenced for crun 1.4, but currently it will fail with crun. Although I think there are a couple of things (pre-dump for example) were we do not have support in crun but only in runc.

[rst0git]

shouldn't there be a check if the runtime actually supports --file-locks?

We could check what is the runtime and its version and if it is an older version of crun we could:

1. Display an error message to update crun and/or mention that users could add file-locks in /etc/criu/default.conf;
2. Or generate a config file for CRIU and specify the option in this way.

I think there are a couple of things (pre-dump for example)

For --pre-checkpoint we could display appropriate error message, and I will look into adding pre-dump support in crun.

@adrianreber What do you think?

[rhatdan]

I am not crazy about adding assumptions like that to the code, since over time they will just become stale. That should probably be a distributions problem, in that it should ensure the OCI runtimes are new enough.