From 5dd2f5ff078423d2e191b699b7f3bb38abf654b3 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 1 Jul 2021 00:04:58 +0100 Subject: [PATCH 1/2] core: do not setup/teardown cgroup if MANAGER_TEST_RUN_MINIMAL is set as a flag Rather than checking if test_run_flags is set exclusively to MANAGER_TEST_RUN_MINIMAL, check if it is set as a flag, so that it can be used together with other flags. --- src/core/cgroup.c | 2 +- src/core/manager.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 3f8e06240f..8f39c9436b 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -3303,7 +3303,7 @@ void manager_shutdown_cgroup(Manager *m, bool delete) { /* We can't really delete the group, since we are in it. But * let's trim it. */ - if (delete && m->cgroup_root && m->test_run_flags != MANAGER_TEST_RUN_MINIMAL) + if (delete && m->cgroup_root && !FLAGS_SET(m->test_run_flags, MANAGER_TEST_RUN_MINIMAL)) (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, m->cgroup_root, false); m->cgroup_empty_event_source = sd_event_source_unref(m->cgroup_empty_event_source); diff --git a/src/core/manager.c b/src/core/manager.c index f3275a4070..c239737e40 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -870,7 +870,7 @@ int manager_new(UnitFileScope scope, ManagerTestRunFlags test_run_flags, Manager if (r < 0) return r; - if (test_run_flags == MANAGER_TEST_RUN_MINIMAL) { + if (FLAGS_SET(test_run_flags, MANAGER_TEST_RUN_MINIMAL)) { m->cgroup_root = strdup(""); if (!m->cgroup_root) return -ENOMEM; From a381a9d13444bf3c3d86e0c8603999fe77d6e3cc Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 1 Jul 2021 00:06:10 +0100 Subject: [PATCH 2/2] analyze: use MANAGER_TEST_RUN_MINIMAL instead of MANAGER_TEST_RUN_BASIC MANAGER_TEST_RUN_MINIMAL allows to skip setting up cgroups, which we don't really want to do in systemd-analyze. MANAGER_TEST_RUN_BASIC doesn't actually do anything by itself anyway. --- src/analyze/analyze-verify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/analyze/analyze-verify.c b/src/analyze/analyze-verify.c index 1b06e07019..bb5bdf998a 100644 --- a/src/analyze/analyze-verify.c +++ b/src/analyze/analyze-verify.c @@ -220,7 +220,7 @@ static int verify_unit(Unit *u, bool check_man) { int verify_units(char **filenames, UnitFileScope scope, bool check_man, bool run_generators) { const ManagerTestRunFlags flags = - MANAGER_TEST_RUN_BASIC | + MANAGER_TEST_RUN_MINIMAL | MANAGER_TEST_RUN_ENV_GENERATORS | run_generators * MANAGER_TEST_RUN_GENERATORS;