43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 1a71c82ea9fd3561b16e2730bea9673219c15843 Mon Sep 17 00:00:00 2001
|
|
From: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
Date: Thu, 27 Aug 2020 12:10:21 +0200
|
|
Subject: [PATCH] state: fix race condition when reading cgroup
|
|
|
|
by the time crun attempts to read from the cgroup, systemd might have
|
|
already cleaned it up. When using systemd, on ENOENT state reports
|
|
the container as "stopped" instead of an error.
|
|
|
|
Closes: https://github.com/containers/podman/issues/7148
|
|
|
|
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
|
|
---
|
|
src/libcrun/container.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libcrun/container.c b/src/libcrun/container.c
|
|
index 3723300..289e551 100644
|
|
--- a/src/libcrun/container.c
|
|
+++ b/src/libcrun/container.c
|
|
@@ -2112,7 +2112,17 @@ libcrun_get_container_state_string (const char *id, libcrun_container_status_t *
|
|
|
|
ret = libcrun_cgroup_is_container_paused (status->cgroup_path, cgroup_mode, &paused, err);
|
|
if (UNLIKELY (ret < 0))
|
|
- return ret;
|
|
+ {
|
|
+ /* The cgroup might have been cleaned up by systemd by the time we try to read it, so ignore ENOENT. */
|
|
+ if (status->systemd_cgroup && crun_error_get_errno (err) == ENOENT)
|
|
+ {
|
|
+ crun_error_release (err);
|
|
+ *container_status = "stopped";
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ return ret;
|
|
+ }
|
|
}
|
|
|
|
if (! *running)
|
|
--
|
|
2.26.2
|
|
|