[systemd-devel] [PATCH] login: Don't stop a running user manager from garbage-collecting the user.

[Lennart Poettering]

On Wed, 11.12.13 19:56, Thomas Bächler (thomas at archlinux.org) wrote:

> With the current logic, a user will never be garbage-collected, since its
> manager will always be around. Change the logic such that a user is
> garbage-collected when it has no sessions and linger is disabled.
> ---
>  src/login/logind-user.c | 12 ------------
>  1 file changed, 12 deletions(-)
> 
> diff --git a/src/login/logind-user.c b/src/login/logind-user.c
> index 6ba8d98..42a7524 100644
> --- a/src/login/logind-user.c
> +++ b/src/login/logind-user.c
> @@ -612,18 +612,6 @@ bool user_check_gc(User *u, bool drop_not_started) {
>          if (user_check_linger_file(u) > 0)
>                  return true;
>  
> -        if (u->slice_job && manager_job_is_active(u->manager, u->slice_job))
> -                return true;
> -
> -        if (u->service_job && manager_job_is_active(u->manager,
> -                u->service_job))
> -                return true;

Hmm, we probably should stay around as long as the jobs are still
active. 

> -
> -        if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
> -                return true;
> -
> -        if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
> -                return true;
> -

THis part should indeed go, yo are right.

Can you check whether things work correctly for you if you only remove
the latter two parts, but leave the former two in? I'lll merge the patch then.

Lennart

-- 
Lennart Poettering, Red Hat