summaryrefslogtreecommitdiff
path: root/libpod/oci_missing.go
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-12-12 16:19:36 -0500
committerMatthew Heon <matthew.heon@pm.me>2019-12-12 16:35:37 -0500
commitbd44fd5c815fc750fd6b60899328564bee74e6e5 (patch)
tree980a0e85eec4f3a646c1f0ac63c05634fd13510b /libpod/oci_missing.go
parentc2dab75f0ec1502e075cf5174d1b308267648fda (diff)
downloadpodman-bd44fd5c815fc750fd6b60899328564bee74e6e5.tar.gz
podman-bd44fd5c815fc750fd6b60899328564bee74e6e5.tar.bz2
podman-bd44fd5c815fc750fd6b60899328564bee74e6e5.zip
Reap exec sessions on cleanup and removal
We currently rely on exec sessions being removed from the state by the Exec() API itself, on detecting the session stopping. This is not a reliable method, though. The Podman frontend for exec could be killed before the session ended, or another Podman process could be holding the lock and prevent update (most notable in `run --rm`, when a container with an active exec session is stopped). To resolve this, add a function to reap active exec sessions from the state, and use it on cleanup (to clear sessions after the container stops) and remove (to do the same when --rm is passed). This is a bit more complicated than it ought to be because Kata and company exist, and we can't guarantee the exec session has a PID on the host, so we have to plumb this through to the OCI runtime. Fixes #4666 Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'libpod/oci_missing.go')
-rw-r--r--libpod/oci_missing.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/oci_missing.go b/libpod/oci_missing.go
index d4524cd34..0faa1805b 100644
--- a/libpod/oci_missing.go
+++ b/libpod/oci_missing.go
@@ -120,6 +120,11 @@ func (r *MissingRuntime) ExecStopContainer(ctr *Container, sessionID string, tim
return r.printError()
}
+// ExecUpdateStatus is not available as the runtime is missing.
+func (r *MissingRuntime) ExecUpdateStatus(ctr *Container, sessionID string) (bool, error) {
+ return false, r.printError()
+}
+
// ExecContainerCleanup is not available as the runtime is missing
func (r *MissingRuntime) ExecContainerCleanup(ctr *Container, sessionID string) error {
return r.printError()