SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: propagate stop too if restart is issued

Browse Source 
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
This commit is contained in:
Mike Yuan
2023-01-19 21:56:58 +08:00
parent fd55b2e599
commit 017a7ba4f4
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/transaction.c
+27 -15
View File
@@ -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;
nt = job_type_collapse(ptype, dep);
if (nt == JOB_NOP)
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);
}
}
/* 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;