From 4370633083dd9453da183c468cf89cc17254ac39 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Mon, 27 Apr 2015 21:19:02 +0300 Subject: core: coldplug all units which participate in jobs during coldplugging This is yet another attempt to fix coldplugging order (more especially, the problem which happens when one creates a job during coldplugging and it references a not-yet-coldplugged unit). Now we forcibly coldplug all units which participate in jobs. This is a superset of previously implemented handling of the UNIT_TRIGGERS dependencies, so that handling is removed. http://lists.freedesktop.org/archives/systemd-devel/2015-April/031212.html https://bugs.freedesktop.org/show_bug.cgi?id=88401 (once again) --- src/core/transaction.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/core/transaction.c') diff --git a/src/core/transaction.c b/src/core/transaction.c index 5974b1e96b..7b19e2f841 100644 --- a/src/core/transaction.c +++ b/src/core/transaction.c @@ -848,6 +848,13 @@ int transaction_add_job_and_dependencies( assert(type < _JOB_TYPE_MAX_IN_TRANSACTION); assert(unit); + /* Before adding jobs for this unit, let's ensure that its state has been loaded + * This matters when jobs are spawned as part of coldplugging itself (see e. g. path_coldplug()). + * This way, we "recursively" coldplug units, ensuring that we do not look at state of + * not-yet-coldplugged units. */ + if (unit->manager->n_reloading > 0) + unit_coldplug(unit); + /* log_debug("Pulling in %s/%s from %s/%s", */ /* unit->id, job_type_to_string(type), */ /* by ? by->unit->id : "NA", */ -- cgit v1.2.3-54-g00ecf