]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #27766 from rphibel/cleanup-cgroups-before-cleaning-units
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 31 May 2023 12:48:42 +0000 (14:48 +0200)
committerGitHub <noreply@github.com>
Wed, 31 May 2023 12:48:42 +0000 (14:48 +0200)
Don't GC unit if it is in cgroup_empty_queue

1  2 
src/core/unit.c

diff --combined src/core/unit.c
index 55bc926c2fe177236bdd5ce08578b19a32b669f2,84e9185e82f76370130edd0ef505c34f2b88c7d0..8b4fb0fce4170b6c5a9f61f743dc61881b7b6990
@@@ -32,7 -32,7 +32,7 @@@
  #include "id128-util.h"
  #include "install.h"
  #include "io-util.h"
 -#include "label.h"
 +#include "label-util.h"
  #include "load-dropin.h"
  #include "load-fragment.h"
  #include "log.h"
@@@ -441,6 -441,9 +441,9 @@@ bool unit_may_gc(Unit *u) 
          if (u->perpetual)
                  return false;
  
+         if (u->in_cgroup_empty_queue)
+                 return false;
          if (sd_bus_track_count(u->bus_track) > 0)
                  return false;