diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-09 10:09:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 10:09:14 +0200 |
| commit | 79f30af384cf6c74f89c3b44c01707da22d867e5 (patch) | |
| tree | 23743436c054a1de091ae7d0ecb008d066786360 /libpod/oci.go | |
| parent | a85e97952994a2803a17ee2a384b260115f18b43 (diff) | |
| parent | 9d964ffb9fc98ed13f6fec974c917b84c175d39a (diff) | |
| download | podman-79f30af384cf6c74f89c3b44c01707da22d867e5.tar.gz podman-79f30af384cf6c74f89c3b44c01707da22d867e5.tar.bz2 podman-79f30af384cf6c74f89c3b44c01707da22d867e5.zip | |
Merge pull request #6520 from mheon/no_conmon_no_error
Ensure Conmon is alive before waiting for exit file
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 684a7ba42..c2f0041b1 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -107,6 +107,13 @@ type OCIRuntime interface { // error. CheckpointContainer(ctr *Container, options ContainerCheckpointOptions) error + // CheckConmonRunning verifies that the given container's Conmon + // instance is still running. Runtimes without Conmon, or systems where + // the PID of conmon is not available, should mock this as True. + // True indicates that Conmon for the instance is running, False + // indicates it is not. + CheckConmonRunning(ctr *Container) (bool, error) + // SupportsCheckpoint returns whether this OCI runtime // implementation supports the CheckpointContainer() operation. SupportsCheckpoint() bool |