From 5d4ccc832547473172dc4f65bdd18b415490273c Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 4 Mar 2022 15:01:01 +0100 Subject: [PATCH] test/scheduler: Don't fail if cgroups don't exist in move_cgroup_procs() This shows a similar problem the a9614bf6e was facing. Some cgroups, especially under v2 + systemd, may have a very small scope, including very limited number of processes (see comment in init_cpuset_cgroup()). If they terminate, their cgroups are removed as well. Change-Id: I0bfc69440f1e7841a7605bc34647f1092cc033aa Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11815 Community-CI: Broadcom CI Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- test/scheduler/cgroups.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/scheduler/cgroups.sh b/test/scheduler/cgroups.sh index 332fe060d..61412cf4c 100644 --- a/test/scheduler/cgroups.sh +++ b/test/scheduler/cgroups.sh @@ -52,8 +52,9 @@ move_cgroup_procs() { local new_cgroup=$2 local proc procs old_proc_interface new_proc_interface - [[ -e $sysfs_cgroup/$old_cgroup ]] || return 1 - [[ -e $sysfs_cgroup/$new_cgroup ]] || return 1 + # If target cgroups don't exist then there's nothing to do. + [[ -e $sysfs_cgroup/$old_cgroup ]] || return 0 + [[ -e $sysfs_cgroup/$new_cgroup ]] || return 0 old_proc_interface=cgroup.procs new_proc_interface=cgroup.procs