From 017a7ba4f406adcf69d6b3ec15b9f2d9ed5ad853 Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sun, 8 Jan 2023 23:16:22 +0800 Subject: [PATCH] core: propagate stop too if restart is issued The restart of a unit should also be considered as that a stop job happens, and thus gets propagated to units specified using PropagatesStopTo=. Fixes #24068 --- src/core/transaction.c | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/src/core/transaction.c b/src/core/transaction.c index 6beca0e6c47..982b6cf6dc3 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -1047,27 +1047,39 @@ int transaction_add_job_and_dependencies( } if (IN_SET(type, JOB_STOP, JOB_RESTART)) { - UnitDependencyAtom atom; - JobType ptype; - + _cleanup_set_free_ Set *propagated_restart = NULL; /* We propagate STOP as STOP, but RESTART only as TRY_RESTART, in order not to start * dependencies that are not around. */ - if (type == JOB_RESTART) { - atom = UNIT_ATOM_PROPAGATE_RESTART; - ptype = JOB_TRY_RESTART; - } else { - ptype = JOB_STOP; - atom = UNIT_ATOM_PROPAGATE_STOP; - } - UNIT_FOREACH_DEPENDENCY(dep, ret->unit, atom) { - JobType nt; + if (type == JOB_RESTART) + UNIT_FOREACH_DEPENDENCY(dep, ret->unit, UNIT_ATOM_PROPAGATE_RESTART) { + JobType nt; + + r = set_ensure_put(&propagated_restart, NULL, dep); + if (r < 0) + return r; + + nt = job_type_collapse(JOB_TRY_RESTART, dep); + if (nt == JOB_NOP) + continue; + + r = transaction_add_job_and_dependencies(tr, nt, dep, ret, true, false, false, ignore_order, e); + if (r < 0) { + if (r != -EBADR) /* job type not applicable */ + return r; + + sd_bus_error_free(e); + } + } - nt = job_type_collapse(ptype, dep); - if (nt == JOB_NOP) + /* The 'stop' part of a restart job is also propagated to + * units with UNIT_ATOM_PROPAGATE_STOP */ + UNIT_FOREACH_DEPENDENCY(dep, ret->unit, UNIT_ATOM_PROPAGATE_STOP) { + /* Units experienced restart propagation are skipped */ + if (set_contains(propagated_restart, dep)) continue; - r = transaction_add_job_and_dependencies(tr, nt, dep, ret, true, false, false, ignore_order, e); + r = transaction_add_job_and_dependencies(tr, JOB_STOP, dep, ret, true, false, false, ignore_order, e); if (r < 0) { if (r != -EBADR) /* job type not applicable */ return r; -- 2.47.3