2010-02-03 13:03:47 +01:00
|
|
|
/***
|
|
|
|
This file is part of systemd.
|
|
|
|
|
|
|
|
Copyright 2010 Lennart Poettering
|
|
|
|
|
|
|
|
systemd is free software; you can redistribute it and/or modify it
|
2012-04-12 00:20:58 +02:00
|
|
|
under the terms of the GNU Lesser General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2.1 of the License, or
|
2010-02-03 13:03:47 +01:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
systemd is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2012-04-12 00:20:58 +02:00
|
|
|
Lesser General Public License for more details.
|
2010-02-03 13:03:47 +01:00
|
|
|
|
2012-04-12 00:20:58 +02:00
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
2010-02-03 13:03:47 +01:00
|
|
|
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
#include <errno.h>
|
2010-01-27 00:15:56 +01:00
|
|
|
#include <stdlib.h>
|
2015-10-23 18:52:53 +02:00
|
|
|
#include <string.h>
|
2010-07-17 00:57:51 +02:00
|
|
|
#include <sys/stat.h>
|
2015-10-23 18:52:53 +02:00
|
|
|
#include <unistd.h>
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-11-19 21:12:59 +01:00
|
|
|
#include "sd-id128.h"
|
|
|
|
#include "sd-messages.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
|
2015-10-27 03:01:06 +01:00
|
|
|
#include "alloc-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "bus-common-errors.h"
|
|
|
|
#include "bus-util.h"
|
2010-07-11 00:50:49 +02:00
|
|
|
#include "cgroup-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "dbus-unit.h"
|
|
|
|
#include "dbus.h"
|
|
|
|
#include "dropin.h"
|
|
|
|
#include "escape.h"
|
|
|
|
#include "execute.h"
|
2013-02-14 12:26:13 +01:00
|
|
|
#include "fileio-label.h"
|
2015-04-10 20:43:52 +02:00
|
|
|
#include "formats-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "load-dropin.h"
|
|
|
|
#include "load-fragment.h"
|
|
|
|
#include "log.h"
|
|
|
|
#include "macro.h"
|
|
|
|
#include "missing.h"
|
|
|
|
#include "mkdir.h"
|
2015-10-26 16:18:16 +01:00
|
|
|
#include "parse-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "path-util.h"
|
2015-04-10 19:10:00 +02:00
|
|
|
#include "process-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "set.h"
|
2016-04-08 11:27:28 +02:00
|
|
|
#include "signal-util.h"
|
2015-09-01 17:25:59 +02:00
|
|
|
#include "special.h"
|
2015-10-26 22:01:44 +01:00
|
|
|
#include "stat-util.h"
|
2016-01-12 15:34:20 +01:00
|
|
|
#include "stdio-util.h"
|
2015-10-24 22:58:24 +02:00
|
|
|
#include "string-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "strv.h"
|
2016-04-07 15:43:59 +02:00
|
|
|
#include "umask-util.h"
|
2015-10-23 18:52:53 +02:00
|
|
|
#include "unit-name.h"
|
2015-09-01 17:25:59 +02:00
|
|
|
#include "unit.h"
|
2015-10-25 22:32:30 +01:00
|
|
|
#include "user-util.h"
|
|
|
|
#include "virt.h"
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
const UnitVTable * const unit_vtable[_UNIT_TYPE_MAX] = {
|
|
|
|
[UNIT_SERVICE] = &service_vtable,
|
|
|
|
[UNIT_SOCKET] = &socket_vtable,
|
2013-12-02 23:30:19 +01:00
|
|
|
[UNIT_BUSNAME] = &busname_vtable,
|
2010-01-26 21:39:06 +01:00
|
|
|
[UNIT_TARGET] = &target_vtable,
|
|
|
|
[UNIT_DEVICE] = &device_vtable,
|
|
|
|
[UNIT_MOUNT] = &mount_vtable,
|
|
|
|
[UNIT_AUTOMOUNT] = &automount_vtable,
|
2010-05-24 05:25:33 +02:00
|
|
|
[UNIT_SWAP] = &swap_vtable,
|
2013-12-02 23:30:19 +01:00
|
|
|
[UNIT_TIMER] = &timer_vtable,
|
2013-06-17 21:33:26 +02:00
|
|
|
[UNIT_PATH] = &path_vtable,
|
2013-07-01 00:03:57 +02:00
|
|
|
[UNIT_SLICE] = &slice_vtable,
|
|
|
|
[UNIT_SCOPE] = &scope_vtable
|
2010-01-26 21:39:06 +01:00
|
|
|
};
|
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
static void maybe_warn_about_dependency(Unit *u, const char *other, UnitDependency dependency);
|
2014-08-08 02:46:49 +02:00
|
|
|
|
2012-01-15 10:53:49 +01:00
|
|
|
Unit *unit_new(Manager *m, size_t size) {
|
2010-01-26 21:39:06 +01:00
|
|
|
Unit *u;
|
|
|
|
|
|
|
|
assert(m);
|
2012-01-15 12:04:08 +01:00
|
|
|
assert(size >= sizeof(Unit));
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 10:53:49 +01:00
|
|
|
u = malloc0(size);
|
|
|
|
if (!u)
|
2010-01-26 21:39:06 +01:00
|
|
|
return NULL;
|
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
u->names = set_new(&string_hash_ops);
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->names) {
|
2010-01-26 21:39:06 +01:00
|
|
|
free(u);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
u->manager = m;
|
|
|
|
u->type = _UNIT_TYPE_INVALID;
|
|
|
|
u->default_dependencies = true;
|
|
|
|
u->unit_file_state = _UNIT_FILE_STATE_INVALID;
|
2014-12-02 02:38:18 +01:00
|
|
|
u->unit_file_preset = -1;
|
2013-11-26 01:39:53 +01:00
|
|
|
u->on_failure_job_mode = JOB_REPLACE;
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
u->cgroup_inotify_wd = -1;
|
core: rework unit timeout handling, and add new setting RuntimeMaxSec=
This clean-ups timeout handling in PID 1. Specifically, instead of storing 0 in internal timeout variables as
indication for a disabled timeout, use USEC_INFINITY which is in-line with how we do this in the rest of our code
(following the logic that 0 means "no", and USEC_INFINITY means "never").
This also replace all usec_t additions with invocations to usec_add(), so that USEC_INFINITY is properly propagated,
and sd-event considers it has indication for turning off the event source.
This also alters the deserialization of the units to restart timeouts from the time they were originally started from.
Before this patch timeouts would be restarted beginning with the time of the deserialization, which could lead to
artificially prolonged timeouts if a daemon reload took place.
Finally, a new RuntimeMaxSec= setting is introduced for service units, that specifies a maximum runtime after which a
specific service is forcibly terminated. This is useful to put time limits on time-intensive processing jobs.
This also simplifies the various xyz_spawn() calls of the various types in that explicit distruction of the timers is
removed, as that is done anyway by the state change handlers, and a state change is always done when the xyz_spawn()
calls fail.
Fixes: #2249
2016-02-01 21:48:10 +01:00
|
|
|
u->job_timeout = USEC_INFINITY;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
core: make the StartLimitXYZ= settings generic and apply to any kind of unit, not just services
This moves the StartLimitBurst=, StartLimitInterval=, StartLimitAction=, RebootArgument= from the [Service] section
into the [Unit] section of unit files, and thus support it in all unit types, not just in services.
This way we can enforce the start limit much earlier, in particular before testing the unit conditions, so that
repeated start-up failure due to failed conditions is also considered for the start limit logic.
For compatibility the four options may also be configured in the [Service] section still, but we only document them in
their new section [Unit].
This also renamed the socket unit failure code "service-failed-permanent" into "service-start-limit-hit" to express
more clearly what it is about, after all it's only triggered through the start limit being hit.
Finally, the code in busname_trigger_notify() and socket_trigger_notify() is altered to become more alike.
Fixes: #2467
2016-02-09 18:38:03 +01:00
|
|
|
RATELIMIT_INIT(u->start_limit, m->default_start_limit_interval, m->default_start_limit_burst);
|
2015-05-19 16:23:14 +02:00
|
|
|
RATELIMIT_INIT(u->auto_stop_ratelimit, 10 * USEC_PER_SEC, 16);
|
2015-05-19 16:00:24 +02:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
return u;
|
|
|
|
}
|
|
|
|
|
2010-04-06 16:32:07 +02:00
|
|
|
bool unit_has_name(Unit *u, const char *name) {
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
return !!set_get(u->names, (char*) name);
|
2010-04-06 16:32:07 +02:00
|
|
|
}
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
static void unit_init(Unit *u) {
|
|
|
|
CGroupContext *cc;
|
|
|
|
ExecContext *ec;
|
|
|
|
KillContext *kc;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(u->manager);
|
|
|
|
assert(u->type >= 0);
|
|
|
|
|
|
|
|
cc = unit_get_cgroup_context(u);
|
|
|
|
if (cc) {
|
|
|
|
cgroup_context_init(cc);
|
|
|
|
|
|
|
|
/* Copy in the manager defaults into the cgroup
|
|
|
|
* context, _before_ the rest of the settings have
|
|
|
|
* been initialized */
|
|
|
|
|
|
|
|
cc->cpu_accounting = u->manager->default_cpu_accounting;
|
|
|
|
cc->blockio_accounting = u->manager->default_blockio_accounting;
|
|
|
|
cc->memory_accounting = u->manager->default_memory_accounting;
|
2015-09-10 12:32:16 +02:00
|
|
|
cc->tasks_accounting = u->manager->default_tasks_accounting;
|
2015-11-13 17:13:55 +01:00
|
|
|
|
|
|
|
if (u->type != UNIT_SLICE)
|
|
|
|
cc->tasks_max = u->manager->default_tasks_max;
|
2014-03-19 20:40:05 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ec = unit_get_exec_context(u);
|
|
|
|
if (ec)
|
|
|
|
exec_context_init(ec);
|
|
|
|
|
|
|
|
kc = unit_get_kill_context(u);
|
|
|
|
if (kc)
|
|
|
|
kill_context_init(kc);
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->init)
|
|
|
|
UNIT_VTABLE(u)->init(u);
|
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
int unit_add_name(Unit *u, const char *text) {
|
2014-03-19 20:40:05 +01:00
|
|
|
_cleanup_free_ char *s = NULL, *i = NULL;
|
2010-01-26 21:39:06 +01:00
|
|
|
UnitType t;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(text);
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
if (unit_name_is_valid(text, UNIT_NAME_TEMPLATE)) {
|
2014-03-19 20:40:05 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->instance)
|
2010-04-15 03:11:11 +02:00
|
|
|
return -EINVAL;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_replace_instance(text, u->instance, &s);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
} else {
|
2010-04-15 03:11:11 +02:00
|
|
|
s = strdup(text);
|
2015-04-30 20:21:00 +02:00
|
|
|
if (!s)
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
if (set_contains(u->names, s))
|
|
|
|
return 0;
|
|
|
|
if (hashmap_contains(u->manager->units, s))
|
|
|
|
return -EEXIST;
|
|
|
|
|
|
|
|
if (!unit_name_is_valid(s, UNIT_NAME_PLAIN|UNIT_NAME_INSTANCE))
|
2014-03-19 20:40:05 +01:00
|
|
|
return -EINVAL;
|
2010-04-10 17:53:17 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
t = unit_name_to_type(s);
|
|
|
|
if (t < 0)
|
|
|
|
return -EINVAL;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (u->type != _UNIT_TYPE_INVALID && t != u->type)
|
|
|
|
return -EINVAL;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-10-22 01:54:10 +02:00
|
|
|
r = unit_name_to_instance(s, &i);
|
|
|
|
if (r < 0)
|
2014-03-19 20:40:05 +01:00
|
|
|
return r;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (i && unit_vtable[t]->no_instances)
|
|
|
|
return -EINVAL;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2010-07-16 19:40:24 +02:00
|
|
|
/* Ensure that this unit is either instanced or not instanced,
|
2015-04-30 20:21:00 +02:00
|
|
|
* but not both. Note that we do allow names with different
|
|
|
|
* instance names however! */
|
2014-03-19 20:40:05 +01:00
|
|
|
if (u->type != _UNIT_TYPE_INVALID && !u->instance != !i)
|
|
|
|
return -EINVAL;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
if (unit_vtable[t]->no_alias && !set_isempty(u->names))
|
2014-03-19 20:40:05 +01:00
|
|
|
return -EEXIST;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (hashmap_size(u->manager->units) >= MANAGER_MAX_NAMES)
|
|
|
|
return -E2BIG;
|
2010-04-22 02:56:42 +02:00
|
|
|
|
2013-10-22 01:54:10 +02:00
|
|
|
r = set_put(u->names, s);
|
2015-04-30 20:21:00 +02:00
|
|
|
if (r < 0)
|
2014-03-19 20:40:05 +01:00
|
|
|
return r;
|
2015-04-30 20:21:00 +02:00
|
|
|
assert(r > 0);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-10-22 01:54:10 +02:00
|
|
|
r = hashmap_put(u->manager->units, s, u);
|
|
|
|
if (r < 0) {
|
2015-04-30 20:21:00 +02:00
|
|
|
(void) set_remove(u->names, s);
|
2014-03-19 20:40:05 +01:00
|
|
|
return r;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->type == _UNIT_TYPE_INVALID) {
|
|
|
|
u->type = t;
|
|
|
|
u->id = s;
|
|
|
|
u->instance = i;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_PREPEND(units_by_type, u->manager->units_by_type[t], u);
|
2010-04-10 17:53:17 +02:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
unit_init(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
i = NULL;
|
|
|
|
}
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
s = NULL;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
|
|
|
return 0;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2010-01-29 01:49:34 +01:00
|
|
|
int unit_choose_id(Unit *u, const char *name) {
|
2013-07-25 17:36:01 +02:00
|
|
|
_cleanup_free_ char *t = NULL;
|
2014-03-19 20:40:05 +01:00
|
|
|
char *s, *i;
|
2010-07-16 19:40:24 +02:00
|
|
|
int r;
|
2010-01-29 01:49:34 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
if (unit_name_is_valid(name, UNIT_NAME_TEMPLATE)) {
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->instance)
|
2010-04-15 03:11:11 +02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_replace_instance(name, u->instance, &t);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
|
|
|
name = t;
|
|
|
|
}
|
|
|
|
|
2010-01-29 01:49:34 +01:00
|
|
|
/* Selects one of the names of this unit as the id */
|
2012-01-15 12:04:08 +01:00
|
|
|
s = set_get(u->names, (char*) name);
|
2010-04-15 03:11:11 +02:00
|
|
|
if (!s)
|
2010-01-29 01:49:34 +01:00
|
|
|
return -ENOENT;
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
/* Determine the new instance from the new id */
|
2013-10-22 01:54:10 +02:00
|
|
|
r = unit_name_to_instance(s, &i);
|
|
|
|
if (r < 0)
|
2010-07-16 19:40:24 +02:00
|
|
|
return r;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
u->id = s;
|
2010-07-16 19:40:24 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
free(u->instance);
|
|
|
|
u->instance = i;
|
2010-07-16 19:40:24 +02:00
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2010-01-29 01:49:34 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-01-29 03:18:09 +01:00
|
|
|
int unit_set_description(Unit *u, const char *description) {
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2013-07-02 15:49:27 +02:00
|
|
|
if (isempty(description))
|
|
|
|
s = NULL;
|
|
|
|
else {
|
|
|
|
s = strdup(description);
|
|
|
|
if (!s)
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
2010-01-29 03:18:09 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
free(u->description);
|
|
|
|
u->description = s;
|
2010-02-05 00:38:41 +01:00
|
|
|
|
|
|
|
unit_add_to_dbus_queue(u);
|
2010-01-29 03:18:09 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-04-21 06:01:13 +02:00
|
|
|
bool unit_check_gc(Unit *u) {
|
2015-01-06 00:26:25 +01:00
|
|
|
UnitActiveState state;
|
2010-04-21 06:01:13 +02:00
|
|
|
assert(u);
|
|
|
|
|
2015-01-06 00:26:25 +01:00
|
|
|
if (u->job)
|
2010-04-21 06:01:13 +02:00
|
|
|
return true;
|
|
|
|
|
2015-01-06 00:26:25 +01:00
|
|
|
if (u->nop_job)
|
2010-08-11 02:07:59 +02:00
|
|
|
return true;
|
|
|
|
|
2015-01-06 00:26:25 +01:00
|
|
|
state = unit_active_state(u);
|
|
|
|
|
|
|
|
/* If the unit is inactive and failed and no job is queued for
|
|
|
|
* it, then release its runtime resources */
|
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(state) &&
|
|
|
|
UNIT_VTABLE(u)->release_resources)
|
|
|
|
UNIT_VTABLE(u)->release_resources(u);
|
|
|
|
|
|
|
|
/* But we keep the unit object around for longer when it is
|
|
|
|
* referenced or configured to not be gc'ed */
|
|
|
|
if (state != UNIT_INACTIVE)
|
2010-04-21 06:01:13 +02:00
|
|
|
return true;
|
|
|
|
|
2015-01-06 00:26:25 +01:00
|
|
|
if (u->no_gc)
|
2010-04-21 06:01:13 +02:00
|
|
|
return true;
|
|
|
|
|
2012-09-10 10:12:10 +02:00
|
|
|
if (u->refs)
|
|
|
|
return true;
|
|
|
|
|
2010-04-21 06:01:13 +02:00
|
|
|
if (UNIT_VTABLE(u)->check_gc)
|
|
|
|
if (UNIT_VTABLE(u)->check_gc(u))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
void unit_add_to_load_queue(Unit *u) {
|
|
|
|
assert(u);
|
2012-01-15 12:04:08 +01:00
|
|
|
assert(u->type != _UNIT_TYPE_INVALID);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state != UNIT_STUB || u->in_load_queue)
|
2010-01-26 21:39:06 +01:00
|
|
|
return;
|
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_PREPEND(load_queue, u->manager->load_queue, u);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_load_queue = true;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
void unit_add_to_cleanup_queue(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_cleanup_queue)
|
2010-04-06 02:43:58 +02:00
|
|
|
return;
|
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_PREPEND(cleanup_queue, u->manager->cleanup_queue, u);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_cleanup_queue = true;
|
2010-04-06 02:43:58 +02:00
|
|
|
}
|
|
|
|
|
2010-04-21 06:01:13 +02:00
|
|
|
void unit_add_to_gc_queue(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_gc_queue || u->in_cleanup_queue)
|
2010-04-21 06:01:13 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (unit_check_gc(u))
|
|
|
|
return;
|
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_PREPEND(gc_queue, u->manager->gc_queue, u);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_gc_queue = true;
|
2010-04-21 06:01:13 +02:00
|
|
|
|
2016-02-23 05:32:04 +01:00
|
|
|
u->manager->n_in_gc_queue++;
|
2010-04-21 06:01:13 +02:00
|
|
|
}
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
void unit_add_to_dbus_queue(Unit *u) {
|
|
|
|
assert(u);
|
2012-01-15 12:04:08 +01:00
|
|
|
assert(u->type != _UNIT_TYPE_INVALID);
|
2010-02-05 00:38:41 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state == UNIT_STUB || u->in_dbus_queue)
|
2010-02-05 00:38:41 +01:00
|
|
|
return;
|
|
|
|
|
2010-07-05 00:58:07 +02:00
|
|
|
/* Shortcut things if nobody cares */
|
2014-03-03 01:33:45 +01:00
|
|
|
if (sd_bus_track_count(u->manager->subscribed) <= 0 &&
|
|
|
|
set_isempty(u->manager->private_buses)) {
|
2012-01-15 12:04:08 +01:00
|
|
|
u->sent_dbus_new_signal = true;
|
2010-05-16 03:57:07 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_PREPEND(dbus_queue, u->manager->dbus_unit_queue, u);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_dbus_queue = true;
|
2010-02-05 00:38:41 +01:00
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
static void bidi_set_free(Unit *u, Set *s) {
|
|
|
|
Iterator i;
|
|
|
|
Unit *other;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
/* Frees the set and makes sure we are dropped from the
|
|
|
|
* inverse pointers */
|
|
|
|
|
|
|
|
SET_FOREACH(other, s, i) {
|
|
|
|
UnitDependency d;
|
|
|
|
|
|
|
|
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
|
2012-01-15 12:04:08 +01:00
|
|
|
set_remove(other->dependencies[d], u);
|
2010-04-21 06:01:13 +02:00
|
|
|
|
|
|
|
unit_add_to_gc_queue(other);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
set_free(s);
|
|
|
|
}
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
static void unit_remove_transient(Unit *u) {
|
|
|
|
char **i;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (!u->transient)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (u->fragment_path)
|
2015-08-28 16:05:32 +02:00
|
|
|
(void) unlink(u->fragment_path);
|
2013-06-28 04:12:58 +02:00
|
|
|
|
|
|
|
STRV_FOREACH(i, u->dropin_paths) {
|
2016-02-25 01:13:57 +01:00
|
|
|
_cleanup_free_ char *p = NULL, *pp = NULL;
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
p = dirname_malloc(*i); /* Get the drop-in directory from the drop-in file */
|
|
|
|
if (!p)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
pp = dirname_malloc(p); /* Get the config directory from the drop-in directory */
|
|
|
|
if (!pp)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Only drop transient drop-ins */
|
|
|
|
if (!path_equal(u->manager->lookup_paths.transient, pp))
|
|
|
|
continue;
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
(void) unlink(*i);
|
|
|
|
(void) rmdir(p);
|
2013-06-28 04:12:58 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-26 20:14:24 +02:00
|
|
|
static void unit_free_requires_mounts_for(Unit *u) {
|
|
|
|
char **j;
|
|
|
|
|
|
|
|
STRV_FOREACH(j, u->requires_mounts_for) {
|
|
|
|
char s[strlen(*j) + 1];
|
|
|
|
|
|
|
|
PATH_FOREACH_PREFIX_MORE(s, *j) {
|
|
|
|
char *y;
|
|
|
|
Set *x;
|
|
|
|
|
|
|
|
x = hashmap_get2(u->manager->units_requiring_mounts_for, s, (void**) &y);
|
|
|
|
if (!x)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
set_remove(x, u);
|
|
|
|
|
|
|
|
if (set_isempty(x)) {
|
|
|
|
hashmap_remove(u->manager->units_requiring_mounts_for, y);
|
|
|
|
free(y);
|
|
|
|
set_free(x);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-09 23:05:10 +02:00
|
|
|
u->requires_mounts_for = strv_free(u->requires_mounts_for);
|
2013-09-26 20:14:24 +02:00
|
|
|
}
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
static void unit_done(Unit *u) {
|
|
|
|
ExecContext *ec;
|
|
|
|
CGroupContext *cc;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (u->type < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->done)
|
|
|
|
UNIT_VTABLE(u)->done(u);
|
|
|
|
|
|
|
|
ec = unit_get_exec_context(u);
|
|
|
|
if (ec)
|
|
|
|
exec_context_done(ec);
|
|
|
|
|
|
|
|
cc = unit_get_cgroup_context(u);
|
|
|
|
if (cc)
|
|
|
|
cgroup_context_done(cc);
|
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
void unit_free(Unit *u) {
|
|
|
|
UnitDependency d;
|
|
|
|
Iterator i;
|
|
|
|
char *t;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
if (u->transient_file)
|
|
|
|
fclose(u->transient_file);
|
|
|
|
|
2016-02-24 21:36:09 +01:00
|
|
|
if (!MANAGER_IS_RELOADING(u->manager))
|
2013-06-28 04:12:58 +02:00
|
|
|
unit_remove_transient(u);
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
bus_unit_send_removed_signal(u);
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
unit_done(u);
|
2010-06-04 22:31:33 +02:00
|
|
|
|
2015-08-06 12:53:06 +02:00
|
|
|
sd_bus_slot_unref(u->match_bus_slot);
|
|
|
|
|
2013-09-26 20:14:24 +02:00
|
|
|
unit_free_requires_mounts_for(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(t, u->names, i)
|
|
|
|
hashmap_remove_value(u->manager->units, t, u);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-04-20 10:21:37 +02:00
|
|
|
if (u->job) {
|
|
|
|
Job *j = u->job;
|
|
|
|
job_uninstall(j);
|
|
|
|
job_free(j);
|
|
|
|
}
|
2010-06-05 02:16:20 +02:00
|
|
|
|
core: add NOP jobs, job type collapsing
Two of our current job types are special:
JOB_TRY_RESTART, JOB_RELOAD_OR_START.
They differ from other job types by being sensitive to the unit active state.
They perform some action when the unit is active and some other action
otherwise. This raises a question: when exactly should the unit state be
checked to make the decision?
Currently the unit state is checked when the job becomes runnable. It's more
sensible to check the state immediately when the job is added by the user.
When the user types "systemctl try-restart foo.service", he really intends
to restart the service if it's running right now. If it isn't running right
now, the restart is pointless.
Consider the example (from Bugzilla[1]):
sleep.service takes some time to start.
hello.service has After=sleep.service.
Both services get started. Two jobs will appear:
hello.service/start waiting
sleep.service/start running
Then someone runs "systemctl try-restart hello.service".
Currently the try-restart operation will block and wait for
sleep.service/start to complete.
The correct result is to complete the try-restart operation immediately
with success, because hello.service is not running. The two original
jobs must not be disturbed by this.
To fix this we introduce two new concepts:
- a new job type: JOB_NOP
A JOB_NOP job does not do anything to the unit. It does not pull in any
dependencies. It is always immediately runnable. When installed to a unit,
it sits in a special slot (u->nop_job) where it never conflicts with
the installed job (u->job) of a different type. It never merges with jobs
of other types, but it can merge into an already installed JOB_NOP job.
- "collapsing" of job types
When a job of one of the two special types is added, the state of the unit
is checked immediately and the job type changes:
JOB_TRY_RESTART -> JOB_RESTART or JOB_NOP
JOB_RELOAD_OR_START -> JOB_RELOAD or JOB_START
Should a job type JOB_RELOAD_OR_START appear later during job merging, it
collapses immediately afterwards.
Collapsing actually makes some things simpler, because there are now fewer
job types that are allowed in the transaction.
[1] Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=753586
2012-04-25 11:58:27 +02:00
|
|
|
if (u->nop_job) {
|
|
|
|
Job *j = u->nop_job;
|
|
|
|
job_uninstall(j);
|
|
|
|
job_free(j);
|
|
|
|
}
|
|
|
|
|
2010-06-05 02:16:20 +02:00
|
|
|
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
|
2012-01-15 12:04:08 +01:00
|
|
|
bidi_set_free(u, u->dependencies[d]);
|
2010-06-05 02:16:20 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->type != _UNIT_TYPE_INVALID)
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(units_by_type, u->manager->units_by_type[u->type], u);
|
2010-01-29 06:04:08 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_load_queue)
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(load_queue, u->manager->load_queue, u);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_dbus_queue)
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(dbus_queue, u->manager->dbus_unit_queue, u);
|
2010-02-05 00:38:41 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_cleanup_queue)
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(cleanup_queue, u->manager->cleanup_queue, u);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_gc_queue) {
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(gc_queue, u->manager->gc_queue, u);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->manager->n_in_gc_queue--;
|
2010-04-21 06:01:13 +02:00
|
|
|
}
|
|
|
|
|
2013-06-27 04:14:27 +02:00
|
|
|
if (u->in_cgroup_queue)
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(cgroup_queue, u->manager->cgroup_queue, u);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
unit_release_cgroup(u);
|
2013-07-10 21:17:37 +02:00
|
|
|
|
2015-09-11 17:25:35 +02:00
|
|
|
(void) manager_update_failed_units(u->manager, u, false);
|
2014-05-22 00:06:16 +02:00
|
|
|
set_remove(u->manager->startup_units, u);
|
2014-03-12 20:55:13 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
free(u->description);
|
2012-05-21 15:12:18 +02:00
|
|
|
strv_free(u->documentation);
|
2012-01-15 12:04:08 +01:00
|
|
|
free(u->fragment_path);
|
2012-05-22 23:08:24 +02:00
|
|
|
free(u->source_path);
|
2013-04-01 12:32:35 +02:00
|
|
|
strv_free(u->dropin_paths);
|
2012-01-15 12:04:08 +01:00
|
|
|
free(u->instance);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-10-28 01:49:07 +01:00
|
|
|
free(u->job_timeout_reboot_arg);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
set_free_free(u->names);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-02-06 17:17:51 +01:00
|
|
|
unit_unwatch_all_pids(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
condition_free_list(u->conditions);
|
2014-11-06 13:43:45 +01:00
|
|
|
condition_free_list(u->asserts);
|
2010-10-13 02:15:41 +02:00
|
|
|
|
core: make the StartLimitXYZ= settings generic and apply to any kind of unit, not just services
This moves the StartLimitBurst=, StartLimitInterval=, StartLimitAction=, RebootArgument= from the [Service] section
into the [Unit] section of unit files, and thus support it in all unit types, not just in services.
This way we can enforce the start limit much earlier, in particular before testing the unit conditions, so that
repeated start-up failure due to failed conditions is also considered for the start limit logic.
For compatibility the four options may also be configured in the [Service] section still, but we only document them in
their new section [Unit].
This also renamed the socket unit failure code "service-failed-permanent" into "service-start-limit-hit" to express
more clearly what it is about, after all it's only triggered through the start limit being hit.
Finally, the code in busname_trigger_notify() and socket_trigger_notify() is altered to become more alike.
Fixes: #2467
2016-02-09 18:38:03 +01:00
|
|
|
free(u->reboot_arg);
|
|
|
|
|
2013-06-18 02:07:35 +02:00
|
|
|
unit_ref_unset(&u->slice);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
while (u->refs)
|
|
|
|
unit_ref_unset(u->refs);
|
2012-01-06 23:08:54 +01:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
free(u);
|
|
|
|
}
|
|
|
|
|
|
|
|
UnitActiveState unit_active_state(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state == UNIT_MERGED)
|
2010-07-01 00:31:53 +02:00
|
|
|
return unit_active_state(unit_follow_merge(u));
|
|
|
|
|
|
|
|
/* After a reload it might happen that a unit is not correctly
|
|
|
|
* loaded but still has a process around. That's why we won't
|
2010-08-31 00:23:34 +02:00
|
|
|
* shortcut failed loading to UNIT_INACTIVE_FAILED. */
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
return UNIT_VTABLE(u)->active_state(u);
|
|
|
|
}
|
|
|
|
|
2010-04-13 20:59:01 +02:00
|
|
|
const char* unit_sub_state_to_string(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
return UNIT_VTABLE(u)->sub_state_to_string(u);
|
|
|
|
}
|
|
|
|
|
2014-10-15 00:23:21 +02:00
|
|
|
static int complete_move(Set **s, Set **other) {
|
|
|
|
int r;
|
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
assert(s);
|
|
|
|
assert(other);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
if (!*other)
|
2014-10-15 00:23:21 +02:00
|
|
|
return 0;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-10-15 00:23:21 +02:00
|
|
|
if (*s) {
|
|
|
|
r = set_move(*s, *other);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
} else {
|
2010-04-06 02:43:58 +02:00
|
|
|
*s = *other;
|
|
|
|
*other = NULL;
|
|
|
|
}
|
2014-10-15 00:23:21 +02:00
|
|
|
|
|
|
|
return 0;
|
2010-04-06 02:43:58 +02:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-10-15 00:23:21 +02:00
|
|
|
static int merge_names(Unit *u, Unit *other) {
|
2010-04-06 02:43:58 +02:00
|
|
|
char *t;
|
|
|
|
Iterator i;
|
2014-10-15 00:23:21 +02:00
|
|
|
int r;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
assert(u);
|
|
|
|
assert(other);
|
|
|
|
|
2014-10-15 00:23:21 +02:00
|
|
|
r = complete_move(&u->names, &other->names);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
set_free_free(other->names);
|
|
|
|
other->names = NULL;
|
|
|
|
other->id = NULL;
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(t, u->names, i)
|
|
|
|
assert_se(hashmap_replace(u->manager->units, t, u) == 0);
|
2014-10-15 00:23:21 +02:00
|
|
|
|
|
|
|
return 0;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2014-10-15 00:00:30 +02:00
|
|
|
static int reserve_dependencies(Unit *u, Unit *other, UnitDependency d) {
|
|
|
|
unsigned n_reserve;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(other);
|
|
|
|
assert(d < _UNIT_DEPENDENCY_MAX);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If u does not have this dependency set allocated, there is no need
|
2014-12-29 10:45:58 +01:00
|
|
|
* to reserve anything. In that case other's set will be transferred
|
2014-10-15 00:00:30 +02:00
|
|
|
* as a whole to u by complete_move().
|
|
|
|
*/
|
|
|
|
if (!u->dependencies[d])
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* merge_dependencies() will skip a u-on-u dependency */
|
|
|
|
n_reserve = set_size(other->dependencies[d]) - !!set_get(other->dependencies[d], u);
|
|
|
|
|
|
|
|
return set_reserve(u->dependencies[d], n_reserve);
|
|
|
|
}
|
|
|
|
|
2014-08-08 02:46:49 +02:00
|
|
|
static void merge_dependencies(Unit *u, Unit *other, const char *other_id, UnitDependency d) {
|
2010-04-06 02:43:58 +02:00
|
|
|
Iterator i;
|
|
|
|
Unit *back;
|
2010-01-26 21:39:06 +01:00
|
|
|
int r;
|
2010-04-06 02:43:58 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(other);
|
|
|
|
assert(d < _UNIT_DEPENDENCY_MAX);
|
|
|
|
|
2010-09-14 01:31:41 +02:00
|
|
|
/* Fix backwards pointers */
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(back, other->dependencies[d], i) {
|
2010-04-06 02:43:58 +02:00
|
|
|
UnitDependency k;
|
|
|
|
|
2013-10-22 01:54:10 +02:00
|
|
|
for (k = 0; k < _UNIT_DEPENDENCY_MAX; k++) {
|
2014-08-08 02:42:58 +02:00
|
|
|
/* Do not add dependencies between u and itself */
|
|
|
|
if (back == u) {
|
2014-08-08 02:46:49 +02:00
|
|
|
if (set_remove(back->dependencies[k], other))
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
maybe_warn_about_dependency(u, other_id, k);
|
2014-08-08 02:42:58 +02:00
|
|
|
} else {
|
|
|
|
r = set_remove_and_put(back->dependencies[k], other, u);
|
|
|
|
if (r == -EEXIST)
|
|
|
|
set_remove(back->dependencies[k], other);
|
|
|
|
else
|
|
|
|
assert(r >= 0 || r == -ENOENT);
|
|
|
|
}
|
2013-10-22 01:54:10 +02:00
|
|
|
}
|
2010-04-06 02:43:58 +02:00
|
|
|
}
|
|
|
|
|
2014-08-08 02:42:58 +02:00
|
|
|
/* Also do not move dependencies on u to itself */
|
2014-08-08 02:46:49 +02:00
|
|
|
back = set_remove(other->dependencies[d], u);
|
|
|
|
if (back)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
maybe_warn_about_dependency(u, other_id, d);
|
2014-08-08 02:42:58 +02:00
|
|
|
|
2014-10-15 00:23:21 +02:00
|
|
|
/* The move cannot fail. The caller must have performed a reservation. */
|
|
|
|
assert_se(complete_move(&u->dependencies[d], &other->dependencies[d]) == 0);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2015-09-09 23:12:07 +02:00
|
|
|
other->dependencies[d] = set_free(other->dependencies[d]);
|
2010-04-06 02:43:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
int unit_merge(Unit *u, Unit *other) {
|
2010-01-26 21:39:06 +01:00
|
|
|
UnitDependency d;
|
2014-08-08 02:46:49 +02:00
|
|
|
const char *other_id = NULL;
|
2014-10-15 00:00:30 +02:00
|
|
|
int r;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(other);
|
2012-01-15 12:04:08 +01:00
|
|
|
assert(u->manager == other->manager);
|
|
|
|
assert(u->type != _UNIT_TYPE_INVALID);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-04-08 04:34:42 +02:00
|
|
|
other = unit_follow_merge(other);
|
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
if (other == u)
|
|
|
|
return 0;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->type != other->type)
|
2010-04-15 03:11:11 +02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->instance != !other->instance)
|
2010-01-26 21:39:06 +01:00
|
|
|
return -EINVAL;
|
|
|
|
|
2016-04-29 17:31:02 +02:00
|
|
|
if (UNIT_VTABLE(u)->no_alias) /* Merging only applies to unit names that support aliases */
|
|
|
|
return -EEXIST;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (other->load_state != UNIT_STUB &&
|
2013-06-28 04:12:58 +02:00
|
|
|
other->load_state != UNIT_NOT_FOUND)
|
2010-04-06 02:43:58 +02:00
|
|
|
return -EEXIST;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (other->job)
|
2010-04-10 04:42:36 +02:00
|
|
|
return -EEXIST;
|
|
|
|
|
core: add NOP jobs, job type collapsing
Two of our current job types are special:
JOB_TRY_RESTART, JOB_RELOAD_OR_START.
They differ from other job types by being sensitive to the unit active state.
They perform some action when the unit is active and some other action
otherwise. This raises a question: when exactly should the unit state be
checked to make the decision?
Currently the unit state is checked when the job becomes runnable. It's more
sensible to check the state immediately when the job is added by the user.
When the user types "systemctl try-restart foo.service", he really intends
to restart the service if it's running right now. If it isn't running right
now, the restart is pointless.
Consider the example (from Bugzilla[1]):
sleep.service takes some time to start.
hello.service has After=sleep.service.
Both services get started. Two jobs will appear:
hello.service/start waiting
sleep.service/start running
Then someone runs "systemctl try-restart hello.service".
Currently the try-restart operation will block and wait for
sleep.service/start to complete.
The correct result is to complete the try-restart operation immediately
with success, because hello.service is not running. The two original
jobs must not be disturbed by this.
To fix this we introduce two new concepts:
- a new job type: JOB_NOP
A JOB_NOP job does not do anything to the unit. It does not pull in any
dependencies. It is always immediately runnable. When installed to a unit,
it sits in a special slot (u->nop_job) where it never conflicts with
the installed job (u->job) of a different type. It never merges with jobs
of other types, but it can merge into an already installed JOB_NOP job.
- "collapsing" of job types
When a job of one of the two special types is added, the state of the unit
is checked immediately and the job type changes:
JOB_TRY_RESTART -> JOB_RESTART or JOB_NOP
JOB_RELOAD_OR_START -> JOB_RELOAD or JOB_START
Should a job type JOB_RELOAD_OR_START appear later during job merging, it
collapses immediately afterwards.
Collapsing actually makes some things simpler, because there are now fewer
job types that are allowed in the transaction.
[1] Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=753586
2012-04-25 11:58:27 +02:00
|
|
|
if (other->nop_job)
|
|
|
|
return -EEXIST;
|
|
|
|
|
2010-08-31 00:23:34 +02:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other)))
|
2010-04-10 04:42:36 +02:00
|
|
|
return -EEXIST;
|
|
|
|
|
2014-08-08 02:46:49 +02:00
|
|
|
if (other->id)
|
|
|
|
other_id = strdupa(other->id);
|
|
|
|
|
2014-10-15 00:00:30 +02:00
|
|
|
/* Make reservations to ensure merge_dependencies() won't fail */
|
|
|
|
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) {
|
|
|
|
r = reserve_dependencies(u, other, d);
|
|
|
|
/*
|
|
|
|
* We don't rollback reservations if we fail. We don't have
|
|
|
|
* a way to undo reservations. A reservation is not a leak.
|
|
|
|
*/
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* Merge names */
|
2014-10-15 00:23:21 +02:00
|
|
|
r = merge_names(u, other);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-06 23:08:54 +01:00
|
|
|
/* Redirect all references */
|
2012-01-15 12:04:08 +01:00
|
|
|
while (other->refs)
|
|
|
|
unit_ref_set(other->refs, u);
|
2012-01-06 23:08:54 +01:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* Merge dependencies */
|
|
|
|
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++)
|
2014-08-08 02:46:49 +02:00
|
|
|
merge_dependencies(u, other, other_id, d);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
other->load_state = UNIT_MERGED;
|
|
|
|
other->merged_into = u;
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2010-04-10 04:43:21 +02:00
|
|
|
/* If there is still some data attached to the other node, we
|
|
|
|
* don't need it anymore, and can free it. */
|
2012-01-15 12:04:08 +01:00
|
|
|
if (other->load_state != UNIT_STUB)
|
2010-04-10 04:43:21 +02:00
|
|
|
if (UNIT_VTABLE(other)->done)
|
|
|
|
UNIT_VTABLE(other)->done(other);
|
|
|
|
|
|
|
|
unit_add_to_dbus_queue(u);
|
2010-04-06 02:43:58 +02:00
|
|
|
unit_add_to_cleanup_queue(other);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_merge_by_name(Unit *u, const char *name) {
|
2016-04-29 17:31:02 +02:00
|
|
|
_cleanup_free_ char *s = NULL;
|
2010-04-06 02:43:58 +02:00
|
|
|
Unit *other;
|
2010-04-15 03:11:11 +02:00
|
|
|
int r;
|
2010-04-06 02:43:58 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
if (unit_name_is_valid(name, UNIT_NAME_TEMPLATE)) {
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->instance)
|
2010-04-15 03:11:11 +02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_replace_instance(name, u->instance, &s);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
|
|
|
name = s;
|
|
|
|
}
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
other = manager_get_unit(u->manager, name);
|
2015-04-30 20:21:00 +02:00
|
|
|
if (other)
|
|
|
|
return unit_merge(u, other);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
return unit_add_name(u, name);
|
2010-04-06 02:43:58 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Unit* unit_follow_merge(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
while (u->load_state == UNIT_MERGED)
|
|
|
|
assert_se(u = u->merged_into);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
|
|
|
return u;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_add_exec_dependencies(Unit *u, ExecContext *c) {
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(c);
|
|
|
|
|
2014-01-27 07:23:20 +01:00
|
|
|
if (c->working_directory) {
|
|
|
|
r = unit_require_mounts_for(u, c->working_directory);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c->root_directory) {
|
|
|
|
r = unit_require_mounts_for(u, c->root_directory);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2016-02-24 21:24:23 +01:00
|
|
|
if (!MANAGER_IS_SYSTEM(u->manager))
|
2014-03-19 16:55:43 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (c->private_tmp) {
|
|
|
|
r = unit_require_mounts_for(u, "/tmp");
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
r = unit_require_mounts_for(u, "/var/tmp");
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-05-20 01:21:38 +02:00
|
|
|
if (c->std_output != EXEC_OUTPUT_KMSG &&
|
|
|
|
c->std_output != EXEC_OUTPUT_SYSLOG &&
|
2012-01-05 23:54:45 +01:00
|
|
|
c->std_output != EXEC_OUTPUT_JOURNAL &&
|
2011-02-15 01:27:53 +01:00
|
|
|
c->std_output != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
|
|
|
|
c->std_output != EXEC_OUTPUT_SYSLOG_AND_CONSOLE &&
|
2012-01-05 23:54:45 +01:00
|
|
|
c->std_output != EXEC_OUTPUT_JOURNAL_AND_CONSOLE &&
|
2010-05-20 01:21:38 +02:00
|
|
|
c->std_error != EXEC_OUTPUT_KMSG &&
|
2011-11-09 20:48:31 +01:00
|
|
|
c->std_error != EXEC_OUTPUT_SYSLOG &&
|
2012-01-05 23:54:45 +01:00
|
|
|
c->std_error != EXEC_OUTPUT_JOURNAL &&
|
2011-11-09 20:48:31 +01:00
|
|
|
c->std_error != EXEC_OUTPUT_KMSG_AND_CONSOLE &&
|
2012-01-05 23:54:45 +01:00
|
|
|
c->std_error != EXEC_OUTPUT_JOURNAL_AND_CONSOLE &&
|
2011-02-15 01:27:53 +01:00
|
|
|
c->std_error != EXEC_OUTPUT_SYSLOG_AND_CONSOLE)
|
2010-04-06 02:43:58 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* If syslog or kernel logging is requested, make sure our own
|
|
|
|
* logging daemon is run first. */
|
|
|
|
|
2014-03-19 16:55:43 +01:00
|
|
|
r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_JOURNALD_SOCKET, NULL, true);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
const char *unit_description(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->description)
|
|
|
|
return u->description;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
return strna(u->id);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void unit_dump(Unit *u, FILE *f, const char *prefix) {
|
2012-05-21 15:12:18 +02:00
|
|
|
char *t, **j;
|
2010-01-26 21:39:06 +01:00
|
|
|
UnitDependency d;
|
|
|
|
Iterator i;
|
2010-02-03 14:21:48 +01:00
|
|
|
const char *prefix2;
|
2010-05-14 03:05:38 +02:00
|
|
|
char
|
2016-02-01 16:01:25 +01:00
|
|
|
timestamp0[FORMAT_TIMESTAMP_MAX],
|
2010-05-14 03:05:38 +02:00
|
|
|
timestamp1[FORMAT_TIMESTAMP_MAX],
|
|
|
|
timestamp2[FORMAT_TIMESTAMP_MAX],
|
|
|
|
timestamp3[FORMAT_TIMESTAMP_MAX],
|
2010-07-17 04:09:28 +02:00
|
|
|
timestamp4[FORMAT_TIMESTAMP_MAX],
|
|
|
|
timespan[FORMAT_TIMESPAN_MAX];
|
2010-07-21 05:00:29 +02:00
|
|
|
Unit *following;
|
2013-11-25 21:16:37 +01:00
|
|
|
_cleanup_set_free_ Set *following_set = NULL;
|
|
|
|
int r;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
2012-01-15 12:04:08 +01:00
|
|
|
assert(u->type >= 0);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-08-21 16:15:49 +02:00
|
|
|
prefix = strempty(prefix);
|
2015-02-03 02:05:59 +01:00
|
|
|
prefix2 = strjoina(prefix, "\t");
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
fprintf(f,
|
2010-04-23 20:25:55 +02:00
|
|
|
"%s-> Unit %s:\n"
|
2010-01-26 21:39:06 +01:00
|
|
|
"%s\tDescription: %s\n"
|
2010-04-15 03:11:11 +02:00
|
|
|
"%s\tInstance: %s\n"
|
2010-01-26 21:39:06 +01:00
|
|
|
"%s\tUnit Load State: %s\n"
|
2010-04-10 04:43:57 +02:00
|
|
|
"%s\tUnit Active State: %s\n"
|
2016-02-12 21:33:39 +01:00
|
|
|
"%s\tState Change Timestamp: %s\n"
|
2010-05-14 03:05:38 +02:00
|
|
|
"%s\tInactive Exit Timestamp: %s\n"
|
2010-04-10 04:43:57 +02:00
|
|
|
"%s\tActive Enter Timestamp: %s\n"
|
2010-04-21 06:01:13 +02:00
|
|
|
"%s\tActive Exit Timestamp: %s\n"
|
2010-05-14 03:05:38 +02:00
|
|
|
"%s\tInactive Enter Timestamp: %s\n"
|
2010-07-17 00:57:51 +02:00
|
|
|
"%s\tGC Check Good: %s\n"
|
2013-06-20 03:45:08 +02:00
|
|
|
"%s\tNeed Daemon Reload: %s\n"
|
2013-06-28 04:12:58 +02:00
|
|
|
"%s\tTransient: %s\n"
|
2013-06-27 04:14:27 +02:00
|
|
|
"%s\tSlice: %s\n"
|
|
|
|
"%s\tCGroup: %s\n"
|
|
|
|
"%s\tCGroup realized: %s\n"
|
2013-11-11 10:03:31 +01:00
|
|
|
"%s\tCGroup mask: 0x%x\n"
|
|
|
|
"%s\tCGroup members mask: 0x%x\n",
|
2012-01-15 12:04:08 +01:00
|
|
|
prefix, u->id,
|
2010-01-26 21:39:06 +01:00
|
|
|
prefix, unit_description(u),
|
2012-01-15 12:04:08 +01:00
|
|
|
prefix, strna(u->instance),
|
|
|
|
prefix, unit_load_state_to_string(u->load_state),
|
2010-04-10 04:43:57 +02:00
|
|
|
prefix, unit_active_state_to_string(unit_active_state(u)),
|
2016-02-01 16:01:25 +01:00
|
|
|
prefix, strna(format_timestamp(timestamp0, sizeof(timestamp0), u->state_change_timestamp.realtime)),
|
2012-01-15 12:04:08 +01:00
|
|
|
prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->inactive_exit_timestamp.realtime)),
|
|
|
|
prefix, strna(format_timestamp(timestamp2, sizeof(timestamp2), u->active_enter_timestamp.realtime)),
|
|
|
|
prefix, strna(format_timestamp(timestamp3, sizeof(timestamp3), u->active_exit_timestamp.realtime)),
|
|
|
|
prefix, strna(format_timestamp(timestamp4, sizeof(timestamp4), u->inactive_enter_timestamp.realtime)),
|
2010-07-17 00:57:51 +02:00
|
|
|
prefix, yes_no(unit_check_gc(u)),
|
2013-06-20 03:45:08 +02:00
|
|
|
prefix, yes_no(unit_need_daemon_reload(u)),
|
2013-06-28 04:12:58 +02:00
|
|
|
prefix, yes_no(u->transient),
|
2013-06-27 04:14:27 +02:00
|
|
|
prefix, strna(unit_slice_name(u)),
|
|
|
|
prefix, strna(u->cgroup_path),
|
|
|
|
prefix, yes_no(u->cgroup_realized),
|
2014-02-14 19:11:07 +01:00
|
|
|
prefix, u->cgroup_realized_mask,
|
2013-11-11 10:03:31 +01:00
|
|
|
prefix, u->cgroup_members_mask);
|
2010-01-27 00:15:56 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(t, u->names, i)
|
2010-01-26 21:39:06 +01:00
|
|
|
fprintf(f, "%s\tName: %s\n", prefix, t);
|
|
|
|
|
2012-05-21 15:12:18 +02:00
|
|
|
STRV_FOREACH(j, u->documentation)
|
|
|
|
fprintf(f, "%s\tDocumentation: %s\n", prefix, *j);
|
|
|
|
|
2013-11-25 21:16:37 +01:00
|
|
|
following = unit_following(u);
|
|
|
|
if (following)
|
2012-01-15 12:04:08 +01:00
|
|
|
fprintf(f, "%s\tFollowing: %s\n", prefix, following->id);
|
2010-07-20 20:33:19 +02:00
|
|
|
|
2013-11-25 21:16:37 +01:00
|
|
|
r = unit_following_set(u, &following_set);
|
|
|
|
if (r >= 0) {
|
|
|
|
Unit *other;
|
|
|
|
|
|
|
|
SET_FOREACH(other, following_set, i)
|
|
|
|
fprintf(f, "%s\tFollowing Set Member: %s\n", prefix, other->id);
|
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->fragment_path)
|
|
|
|
fprintf(f, "%s\tFragment Path: %s\n", prefix, u->fragment_path);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2012-05-22 23:08:24 +02:00
|
|
|
if (u->source_path)
|
|
|
|
fprintf(f, "%s\tSource Path: %s\n", prefix, u->source_path);
|
|
|
|
|
2013-04-01 12:32:35 +02:00
|
|
|
STRV_FOREACH(j, u->dropin_paths)
|
2013-04-02 16:24:45 +02:00
|
|
|
fprintf(f, "%s\tDropIn Path: %s\n", prefix, *j);
|
2013-04-01 12:32:35 +02:00
|
|
|
|
core: rework unit timeout handling, and add new setting RuntimeMaxSec=
This clean-ups timeout handling in PID 1. Specifically, instead of storing 0 in internal timeout variables as
indication for a disabled timeout, use USEC_INFINITY which is in-line with how we do this in the rest of our code
(following the logic that 0 means "no", and USEC_INFINITY means "never").
This also replace all usec_t additions with invocations to usec_add(), so that USEC_INFINITY is properly propagated,
and sd-event considers it has indication for turning off the event source.
This also alters the deserialization of the units to restart timeouts from the time they were originally started from.
Before this patch timeouts would be restarted beginning with the time of the deserialization, which could lead to
artificially prolonged timeouts if a daemon reload took place.
Finally, a new RuntimeMaxSec= setting is introduced for service units, that specifies a maximum runtime after which a
specific service is forcibly terminated. This is useful to put time limits on time-intensive processing jobs.
This also simplifies the various xyz_spawn() calls of the various types in that explicit distruction of the timers is
removed, as that is done anyway by the state change handlers, and a state change is always done when the xyz_spawn()
calls fail.
Fixes: #2249
2016-02-01 21:48:10 +01:00
|
|
|
if (u->job_timeout != USEC_INFINITY)
|
2013-04-04 02:56:56 +02:00
|
|
|
fprintf(f, "%s\tJob Timeout: %s\n", prefix, format_timespan(timespan, sizeof(timespan), u->job_timeout, 0));
|
2010-07-17 04:09:28 +02:00
|
|
|
|
2014-10-28 01:49:07 +01:00
|
|
|
if (u->job_timeout_action != FAILURE_ACTION_NONE)
|
|
|
|
fprintf(f, "%s\tJob Timeout Action: %s\n", prefix, failure_action_to_string(u->job_timeout_action));
|
|
|
|
|
|
|
|
if (u->job_timeout_reboot_arg)
|
|
|
|
fprintf(f, "%s\tJob Timeout Reboot Argument: %s\n", prefix, u->job_timeout_reboot_arg);
|
|
|
|
|
2014-11-06 13:43:45 +01:00
|
|
|
condition_dump_list(u->conditions, f, prefix, condition_type_to_string);
|
|
|
|
condition_dump_list(u->asserts, f, prefix, assert_type_to_string);
|
2010-10-13 02:15:41 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (dual_timestamp_is_set(&u->condition_timestamp))
|
2011-03-17 04:36:19 +01:00
|
|
|
fprintf(f,
|
|
|
|
"%s\tCondition Timestamp: %s\n"
|
|
|
|
"%s\tCondition Result: %s\n",
|
2012-01-15 12:04:08 +01:00
|
|
|
prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->condition_timestamp.realtime)),
|
|
|
|
prefix, yes_no(u->condition_result));
|
2011-03-17 04:36:19 +01:00
|
|
|
|
2014-11-06 13:43:45 +01:00
|
|
|
if (dual_timestamp_is_set(&u->assert_timestamp))
|
|
|
|
fprintf(f,
|
|
|
|
"%s\tAssert Timestamp: %s\n"
|
|
|
|
"%s\tAssert Result: %s\n",
|
|
|
|
prefix, strna(format_timestamp(timestamp1, sizeof(timestamp1), u->assert_timestamp.realtime)),
|
|
|
|
prefix, yes_no(u->assert_result));
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
for (d = 0; d < _UNIT_DEPENDENCY_MAX; d++) {
|
|
|
|
Unit *other;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[d], i)
|
|
|
|
fprintf(f, "%s\t%s: %s\n", prefix, unit_dependency_to_string(d), other->id);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2012-04-29 14:26:07 +02:00
|
|
|
if (!strv_isempty(u->requires_mounts_for)) {
|
|
|
|
fprintf(f,
|
|
|
|
"%s\tRequiresMountsFor:", prefix);
|
|
|
|
|
|
|
|
STRV_FOREACH(j, u->requires_mounts_for)
|
|
|
|
fprintf(f, " %s", *j);
|
|
|
|
|
|
|
|
fputs("\n", f);
|
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state == UNIT_LOADED) {
|
2011-08-20 00:20:41 +02:00
|
|
|
|
2010-04-10 04:44:24 +02:00
|
|
|
fprintf(f,
|
2010-07-03 19:48:33 +02:00
|
|
|
"%s\tStopWhenUnneeded: %s\n"
|
2010-08-10 20:57:21 +02:00
|
|
|
"%s\tRefuseManualStart: %s\n"
|
|
|
|
"%s\tRefuseManualStop: %s\n"
|
2011-04-07 04:11:31 +02:00
|
|
|
"%s\tDefaultDependencies: %s\n"
|
2013-11-26 01:39:53 +01:00
|
|
|
"%s\tOnFailureJobMode: %s\n"
|
Remove snapshot unit type
Snapshots were never useful or used for anything. Many systemd
developers that I spoke to at systemd.conf2015, didn't even know they
existed, so it is fairly safe to assume that this type can be deleted
without harm.
The fundamental problem with snapshots is that the state of the system
is dynamic, devices come and go, users log in and out, timers fire...
and restoring all units to some state from the past would "undo"
those changes, which isn't really possible.
Tested by creating a snapshot, running the new binary, and checking
that the transition did not cause errors, and the snapshot is gone,
and snapshots cannot be created anymore.
New systemctl says:
Unknown operation snapshot.
Old systemctl says:
Failed to create snapshot: Support for snapshots has been removed.
IgnoreOnSnaphost settings are warned about and ignored:
Support for option IgnoreOnSnapshot= has been removed and it is ignored
http://lists.freedesktop.org/archives/systemd-devel/2015-November/034872.html
2015-11-08 14:12:54 +01:00
|
|
|
"%s\tIgnoreOnIsolate: %s\n",
|
2012-01-15 12:04:08 +01:00
|
|
|
prefix, yes_no(u->stop_when_unneeded),
|
|
|
|
prefix, yes_no(u->refuse_manual_start),
|
|
|
|
prefix, yes_no(u->refuse_manual_stop),
|
|
|
|
prefix, yes_no(u->default_dependencies),
|
2013-11-26 01:39:53 +01:00
|
|
|
prefix, job_mode_to_string(u->on_failure_job_mode),
|
Remove snapshot unit type
Snapshots were never useful or used for anything. Many systemd
developers that I spoke to at systemd.conf2015, didn't even know they
existed, so it is fairly safe to assume that this type can be deleted
without harm.
The fundamental problem with snapshots is that the state of the system
is dynamic, devices come and go, users log in and out, timers fire...
and restoring all units to some state from the past would "undo"
those changes, which isn't really possible.
Tested by creating a snapshot, running the new binary, and checking
that the transition did not cause errors, and the snapshot is gone,
and snapshots cannot be created anymore.
New systemctl says:
Unknown operation snapshot.
Old systemctl says:
Failed to create snapshot: Support for snapshots has been removed.
IgnoreOnSnaphost settings are warned about and ignored:
Support for option IgnoreOnSnapshot= has been removed and it is ignored
http://lists.freedesktop.org/archives/systemd-devel/2015-November/034872.html
2015-11-08 14:12:54 +01:00
|
|
|
prefix, yes_no(u->ignore_on_isolate));
|
2012-01-15 12:04:08 +01:00
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
if (UNIT_VTABLE(u)->dump)
|
|
|
|
UNIT_VTABLE(u)->dump(u, f, prefix2);
|
2010-04-10 04:44:24 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
} else if (u->load_state == UNIT_MERGED)
|
2010-04-10 04:44:24 +02:00
|
|
|
fprintf(f,
|
|
|
|
"%s\tMerged into: %s\n",
|
2012-01-15 12:04:08 +01:00
|
|
|
prefix, u->merged_into->id);
|
|
|
|
else if (u->load_state == UNIT_ERROR)
|
|
|
|
fprintf(f, "%s\tLoad Error Code: %s\n", prefix, strerror(-u->load_error));
|
2010-08-12 01:05:35 +02:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->job)
|
|
|
|
job_dump(u->job, f, prefix2);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
core: add NOP jobs, job type collapsing
Two of our current job types are special:
JOB_TRY_RESTART, JOB_RELOAD_OR_START.
They differ from other job types by being sensitive to the unit active state.
They perform some action when the unit is active and some other action
otherwise. This raises a question: when exactly should the unit state be
checked to make the decision?
Currently the unit state is checked when the job becomes runnable. It's more
sensible to check the state immediately when the job is added by the user.
When the user types "systemctl try-restart foo.service", he really intends
to restart the service if it's running right now. If it isn't running right
now, the restart is pointless.
Consider the example (from Bugzilla[1]):
sleep.service takes some time to start.
hello.service has After=sleep.service.
Both services get started. Two jobs will appear:
hello.service/start waiting
sleep.service/start running
Then someone runs "systemctl try-restart hello.service".
Currently the try-restart operation will block and wait for
sleep.service/start to complete.
The correct result is to complete the try-restart operation immediately
with success, because hello.service is not running. The two original
jobs must not be disturbed by this.
To fix this we introduce two new concepts:
- a new job type: JOB_NOP
A JOB_NOP job does not do anything to the unit. It does not pull in any
dependencies. It is always immediately runnable. When installed to a unit,
it sits in a special slot (u->nop_job) where it never conflicts with
the installed job (u->job) of a different type. It never merges with jobs
of other types, but it can merge into an already installed JOB_NOP job.
- "collapsing" of job types
When a job of one of the two special types is added, the state of the unit
is checked immediately and the job type changes:
JOB_TRY_RESTART -> JOB_RESTART or JOB_NOP
JOB_RELOAD_OR_START -> JOB_RELOAD or JOB_START
Should a job type JOB_RELOAD_OR_START appear later during job merging, it
collapses immediately afterwards.
Collapsing actually makes some things simpler, because there are now fewer
job types that are allowed in the transaction.
[1] Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=753586
2012-04-25 11:58:27 +02:00
|
|
|
if (u->nop_job)
|
|
|
|
job_dump(u->nop_job, f, prefix2);
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Common implementation for multiple backends */
|
2010-04-10 17:53:17 +02:00
|
|
|
int unit_load_fragment_and_dropin(Unit *u) {
|
2010-04-06 02:43:58 +02:00
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2013-10-22 01:54:10 +02:00
|
|
|
/* Load a .{service,socket,...} file */
|
2013-06-27 04:14:27 +02:00
|
|
|
r = unit_load_fragment(u);
|
|
|
|
if (r < 0)
|
2010-04-06 02:43:58 +02:00
|
|
|
return r;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state == UNIT_STUB)
|
2010-04-06 02:43:58 +02:00
|
|
|
return -ENOENT;
|
|
|
|
|
|
|
|
/* Load drop-in directory data */
|
2013-06-27 04:14:27 +02:00
|
|
|
r = unit_load_dropin(unit_follow_merge(u));
|
|
|
|
if (r < 0)
|
2010-04-06 02:43:58 +02:00
|
|
|
return r;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Common implementation for multiple backends */
|
2010-04-10 17:53:17 +02:00
|
|
|
int unit_load_fragment_and_dropin_optional(Unit *u) {
|
2010-04-06 02:43:58 +02:00
|
|
|
int r;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
/* Same as unit_load_fragment_and_dropin(), but whether
|
|
|
|
* something can be loaded or not doesn't matter. */
|
|
|
|
|
|
|
|
/* Load a .service file */
|
2013-06-27 04:14:27 +02:00
|
|
|
r = unit_load_fragment(u);
|
|
|
|
if (r < 0)
|
2010-01-26 21:39:06 +01:00
|
|
|
return r;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state == UNIT_STUB)
|
|
|
|
u->load_state = UNIT_LOADED;
|
2010-01-28 02:44:47 +01:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* Load drop-in directory data */
|
2013-06-27 04:14:27 +02:00
|
|
|
r = unit_load_dropin(unit_follow_merge(u));
|
|
|
|
if (r < 0)
|
2010-01-26 21:39:06 +01:00
|
|
|
return r;
|
|
|
|
|
2010-04-06 02:43:58 +02:00
|
|
|
return 0;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2010-09-14 01:51:30 +02:00
|
|
|
int unit_add_default_target_dependency(Unit *u, Unit *target) {
|
2010-09-13 12:06:49 +02:00
|
|
|
assert(u);
|
|
|
|
assert(target);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (target->type != UNIT_TARGET)
|
2010-09-13 12:06:49 +02:00
|
|
|
return 0;
|
|
|
|
|
2011-02-21 15:32:17 +01:00
|
|
|
/* Only add the dependency if both units are loaded, so that
|
2010-09-14 01:51:30 +02:00
|
|
|
* that loop check below is reliable */
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state != UNIT_LOADED ||
|
|
|
|
target->load_state != UNIT_LOADED)
|
2010-09-14 01:51:30 +02:00
|
|
|
return 0;
|
|
|
|
|
2011-03-08 03:24:42 +01:00
|
|
|
/* If either side wants no automatic dependencies, then let's
|
|
|
|
* skip this */
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->default_dependencies ||
|
|
|
|
!target->default_dependencies)
|
2011-03-08 03:24:42 +01:00
|
|
|
return 0;
|
|
|
|
|
2010-09-13 12:06:49 +02:00
|
|
|
/* Don't create loops */
|
2012-01-15 12:04:08 +01:00
|
|
|
if (set_get(target->dependencies[UNIT_BEFORE], u))
|
2010-09-13 12:06:49 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return unit_add_dependency(target, UNIT_AFTER, u, true);
|
|
|
|
}
|
|
|
|
|
2014-02-17 01:19:08 +01:00
|
|
|
static int unit_add_target_dependencies(Unit *u) {
|
2013-06-17 21:33:26 +02:00
|
|
|
|
2011-03-08 03:24:42 +01:00
|
|
|
static const UnitDependency deps[] = {
|
|
|
|
UNIT_REQUIRED_BY,
|
2015-05-19 01:24:28 +02:00
|
|
|
UNIT_REQUISITE_OF,
|
2011-03-08 03:24:42 +01:00
|
|
|
UNIT_WANTED_BY,
|
|
|
|
UNIT_BOUND_BY
|
|
|
|
};
|
|
|
|
|
2010-09-14 01:51:30 +02:00
|
|
|
Unit *target;
|
2010-09-13 12:06:49 +02:00
|
|
|
Iterator i;
|
2011-03-08 03:24:42 +01:00
|
|
|
unsigned k;
|
2014-02-20 13:29:54 +01:00
|
|
|
int r = 0;
|
2010-09-13 12:06:49 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2011-03-08 03:24:42 +01:00
|
|
|
for (k = 0; k < ELEMENTSOF(deps); k++)
|
2013-06-17 21:33:26 +02:00
|
|
|
SET_FOREACH(target, u->dependencies[deps[k]], i) {
|
|
|
|
r = unit_add_default_target_dependency(u, target);
|
|
|
|
if (r < 0)
|
2011-03-08 03:24:42 +01:00
|
|
|
return r;
|
2013-06-17 21:33:26 +02:00
|
|
|
}
|
|
|
|
|
2014-02-17 01:19:08 +01:00
|
|
|
return r;
|
|
|
|
}
|
2013-06-27 04:14:27 +02:00
|
|
|
|
2014-02-17 01:19:08 +01:00
|
|
|
static int unit_add_slice_dependencies(Unit *u) {
|
|
|
|
assert(u);
|
2010-10-28 23:18:47 +02:00
|
|
|
|
2015-08-28 17:14:59 +02:00
|
|
|
if (!UNIT_HAS_CGROUP_CONTEXT(u))
|
2014-02-17 01:19:08 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (UNIT_ISSET(u->slice))
|
2015-09-29 13:06:28 +02:00
|
|
|
return unit_add_two_dependencies(u, UNIT_AFTER, UNIT_REQUIRES, UNIT_DEREF(u->slice), true);
|
2014-02-17 01:19:08 +01:00
|
|
|
|
2015-09-29 13:06:28 +02:00
|
|
|
if (unit_has_name(u, SPECIAL_ROOT_SLICE))
|
2014-08-08 02:46:49 +02:00
|
|
|
return 0;
|
|
|
|
|
2015-09-29 13:06:28 +02:00
|
|
|
return unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_ROOT_SLICE, NULL, true);
|
2010-09-13 12:06:49 +02:00
|
|
|
}
|
|
|
|
|
2014-02-17 01:19:08 +01:00
|
|
|
static int unit_add_mount_dependencies(Unit *u) {
|
2013-11-08 18:11:09 +01:00
|
|
|
char **i;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
STRV_FOREACH(i, u->requires_mounts_for) {
|
|
|
|
char prefix[strlen(*i) + 1];
|
|
|
|
|
|
|
|
PATH_FOREACH_PREFIX_MORE(prefix, *i) {
|
2015-10-08 19:06:06 +02:00
|
|
|
_cleanup_free_ char *p = NULL;
|
2013-11-08 18:11:09 +01:00
|
|
|
Unit *m;
|
|
|
|
|
2015-10-08 19:06:06 +02:00
|
|
|
r = unit_name_from_path(prefix, ".mount", &p);
|
2013-11-08 18:11:09 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2015-10-08 19:06:06 +02:00
|
|
|
|
|
|
|
m = manager_get_unit(u->manager, p);
|
|
|
|
if (!m) {
|
|
|
|
/* Make sure to load the mount unit if
|
|
|
|
* it exists. If so the dependencies
|
|
|
|
* on this unit will be added later
|
|
|
|
* during the loading of the mount
|
|
|
|
* unit. */
|
|
|
|
(void) manager_load_unit_prepare(u->manager, p, NULL, NULL, &m);
|
2013-11-08 18:11:09 +01:00
|
|
|
continue;
|
2015-10-08 19:06:06 +02:00
|
|
|
}
|
2013-11-08 18:11:09 +01:00
|
|
|
if (m == u)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (m->load_state != UNIT_LOADED)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
r = unit_add_dependency(u, UNIT_AFTER, m, true);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
if (m->fragment_path) {
|
|
|
|
r = unit_add_dependency(u, UNIT_REQUIRES, m, true);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-05-15 17:09:34 +02:00
|
|
|
static int unit_add_startup_units(Unit *u) {
|
|
|
|
CGroupContext *c;
|
2015-09-11 17:25:35 +02:00
|
|
|
int r;
|
2014-05-15 17:09:34 +02:00
|
|
|
|
|
|
|
c = unit_get_cgroup_context(u);
|
2014-05-22 00:06:16 +02:00
|
|
|
if (!c)
|
|
|
|
return 0;
|
|
|
|
|
2015-09-11 16:48:24 +02:00
|
|
|
if (c->startup_cpu_shares == CGROUP_CPU_SHARES_INVALID &&
|
|
|
|
c->startup_blockio_weight == CGROUP_BLKIO_WEIGHT_INVALID)
|
2014-05-22 00:06:16 +02:00
|
|
|
return 0;
|
|
|
|
|
2015-09-11 17:25:35 +02:00
|
|
|
r = set_ensure_allocated(&u->manager->startup_units, NULL);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2015-04-10 16:53:17 +02:00
|
|
|
return set_put(u->manager->startup_units, u);
|
2014-05-15 17:09:34 +02:00
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
int unit_load(Unit *u) {
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->in_load_queue) {
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(load_queue, u->manager->load_queue, u);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_load_queue = false;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->type == _UNIT_TYPE_INVALID)
|
2010-04-10 17:53:17 +02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state != UNIT_STUB)
|
2010-01-26 21:39:06 +01:00
|
|
|
return 0;
|
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
if (u->transient_file) {
|
|
|
|
r = fflush_and_check(u->transient_file);
|
|
|
|
if (r < 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
fclose(u->transient_file);
|
|
|
|
u->transient_file = NULL;
|
2016-04-11 18:20:02 +02:00
|
|
|
|
|
|
|
u->dropin_mtime = now(CLOCK_REALTIME);
|
2016-04-07 15:43:59 +02:00
|
|
|
}
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
if (UNIT_VTABLE(u)->load) {
|
|
|
|
r = UNIT_VTABLE(u)->load(u);
|
|
|
|
if (r < 0)
|
2010-01-26 21:39:06 +01:00
|
|
|
goto fail;
|
2013-06-28 04:12:58 +02:00
|
|
|
}
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state == UNIT_STUB) {
|
2010-04-06 02:43:58 +02:00
|
|
|
r = -ENOENT;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2012-04-29 14:26:07 +02:00
|
|
|
if (u->load_state == UNIT_LOADED) {
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2014-02-17 01:19:08 +01:00
|
|
|
r = unit_add_target_dependencies(u);
|
|
|
|
if (r < 0)
|
|
|
|
goto fail;
|
|
|
|
|
|
|
|
r = unit_add_slice_dependencies(u);
|
|
|
|
if (r < 0)
|
|
|
|
goto fail;
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2014-02-17 01:19:08 +01:00
|
|
|
r = unit_add_mount_dependencies(u);
|
2012-04-29 14:26:07 +02:00
|
|
|
if (r < 0)
|
2013-06-28 04:12:58 +02:00
|
|
|
goto fail;
|
2012-04-29 14:26:07 +02:00
|
|
|
|
2014-05-15 17:09:34 +02:00
|
|
|
r = unit_add_startup_units(u);
|
|
|
|
if (r < 0)
|
|
|
|
goto fail;
|
|
|
|
|
2014-02-14 19:11:07 +01:00
|
|
|
if (u->on_failure_job_mode == JOB_ISOLATE && set_size(u->dependencies[UNIT_ON_FAILURE]) > 1) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_error(u, "More than one OnFailure= dependencies specified but OnFailureJobMode=isolate set. Refusing.");
|
2013-06-28 04:12:58 +02:00
|
|
|
r = -EINVAL;
|
|
|
|
goto fail;
|
|
|
|
}
|
2014-02-14 19:11:07 +01:00
|
|
|
|
|
|
|
unit_update_cgroup_members_masks(u);
|
2011-04-07 18:47:35 +02:00
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
assert((u->load_state != UNIT_MERGED) == !u->merged_into);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
|
|
|
unit_add_to_dbus_queue(unit_follow_merge(u));
|
2010-04-21 06:01:13 +02:00
|
|
|
unit_add_to_gc_queue(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail:
|
2013-06-28 04:12:58 +02:00
|
|
|
u->load_state = u->load_state == UNIT_STUB ? UNIT_NOT_FOUND : UNIT_ERROR;
|
2012-01-15 12:04:08 +01:00
|
|
|
u->load_error = r;
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2011-12-06 00:47:28 +01:00
|
|
|
unit_add_to_gc_queue(u);
|
2010-04-06 02:43:58 +02:00
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug_errno(u, r, "Failed to load configuration: %m");
|
2010-04-06 02:43:58 +02:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2014-11-06 14:09:51 +01:00
|
|
|
static bool unit_condition_test_list(Unit *u, Condition *first, const char *(*to_string)(ConditionType t)) {
|
|
|
|
Condition *c;
|
|
|
|
int triggered = -1;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(to_string);
|
|
|
|
|
|
|
|
/* If the condition list is empty, then it is true */
|
|
|
|
if (!first)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Otherwise, if all of the non-trigger conditions apply and
|
|
|
|
* if any of the trigger conditions apply (unless there are
|
|
|
|
* none) we return true */
|
|
|
|
LIST_FOREACH(conditions, c, first) {
|
|
|
|
int r;
|
|
|
|
|
|
|
|
r = condition_test(c);
|
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_warning(u,
|
|
|
|
"Couldn't determine result for %s=%s%s%s, assuming failed: %m",
|
2014-11-06 14:09:51 +01:00
|
|
|
to_string(c->type),
|
|
|
|
c->trigger ? "|" : "",
|
|
|
|
c->negate ? "!" : "",
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
c->parameter);
|
2014-11-06 14:09:51 +01:00
|
|
|
else
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u,
|
|
|
|
"%s=%s%s%s %s.",
|
2014-11-06 14:09:51 +01:00
|
|
|
to_string(c->type),
|
|
|
|
c->trigger ? "|" : "",
|
|
|
|
c->negate ? "!" : "",
|
|
|
|
c->parameter,
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
condition_result_to_string(c->result));
|
2014-11-06 14:09:51 +01:00
|
|
|
|
|
|
|
if (!c->trigger && r <= 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (c->trigger && triggered <= 0)
|
|
|
|
triggered = r > 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return triggered != 0;
|
|
|
|
}
|
|
|
|
|
2013-11-08 18:11:09 +01:00
|
|
|
static bool unit_condition_test(Unit *u) {
|
2011-03-09 23:58:17 +01:00
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_get(&u->condition_timestamp);
|
2014-11-06 14:09:51 +01:00
|
|
|
u->condition_result = unit_condition_test_list(u, u->conditions, condition_type_to_string);
|
2011-03-09 23:58:17 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
return u->condition_result;
|
2011-03-09 23:58:17 +01:00
|
|
|
}
|
|
|
|
|
2014-11-06 13:43:45 +01:00
|
|
|
static bool unit_assert_test(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
dual_timestamp_get(&u->assert_timestamp);
|
2014-11-06 14:09:51 +01:00
|
|
|
u->assert_result = unit_condition_test_list(u, u->asserts, assert_type_to_string);
|
2014-11-06 13:43:45 +01:00
|
|
|
|
|
|
|
return u->assert_result;
|
|
|
|
}
|
|
|
|
|
2015-11-17 17:11:44 +01:00
|
|
|
void unit_status_printf(Unit *u, const char *status, const char *unit_status_msg_format) {
|
|
|
|
DISABLE_WARNING_FORMAT_NONLITERAL;
|
|
|
|
manager_status_printf(u->manager, STATUS_TYPE_NORMAL, status, unit_status_msg_format, unit_description(u));
|
|
|
|
REENABLE_WARNING;
|
|
|
|
}
|
|
|
|
|
2013-05-03 04:51:50 +02:00
|
|
|
_pure_ static const char* unit_get_status_message_format(Unit *u, JobType t) {
|
2012-08-24 22:21:20 +02:00
|
|
|
const char *format;
|
2015-07-20 17:18:13 +02:00
|
|
|
const UnitStatusMessageFormats *format_table;
|
2012-08-24 22:21:20 +02:00
|
|
|
|
|
|
|
assert(u);
|
2015-11-17 17:11:44 +01:00
|
|
|
assert(IN_SET(t, JOB_START, JOB_STOP, JOB_RELOAD));
|
2012-08-24 22:21:20 +02:00
|
|
|
|
2015-07-20 18:36:12 +02:00
|
|
|
if (t != JOB_RELOAD) {
|
2015-07-20 17:18:13 +02:00
|
|
|
format_table = &UNIT_VTABLE(u)->status_message_formats;
|
|
|
|
if (format_table) {
|
|
|
|
format = format_table->starting_stopping[t == JOB_STOP];
|
|
|
|
if (format)
|
|
|
|
return format;
|
|
|
|
}
|
|
|
|
}
|
2012-08-24 22:21:20 +02:00
|
|
|
|
|
|
|
/* Return generic strings */
|
|
|
|
if (t == JOB_START)
|
|
|
|
return "Starting %s.";
|
|
|
|
else if (t == JOB_STOP)
|
|
|
|
return "Stopping %s.";
|
2015-07-20 18:36:12 +02:00
|
|
|
else
|
2012-08-24 22:21:20 +02:00
|
|
|
return "Reloading %s.";
|
|
|
|
}
|
|
|
|
|
|
|
|
static void unit_status_print_starting_stopping(Unit *u, JobType t) {
|
|
|
|
const char *format;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2015-11-17 17:11:44 +01:00
|
|
|
/* Reload status messages have traditionally not been printed to console. */
|
|
|
|
if (!IN_SET(t, JOB_START, JOB_STOP))
|
|
|
|
return;
|
|
|
|
|
2012-08-24 22:21:20 +02:00
|
|
|
format = unit_get_status_message_format(u, t);
|
2012-05-13 18:18:54 +02:00
|
|
|
|
2014-02-20 18:18:32 +01:00
|
|
|
DISABLE_WARNING_FORMAT_NONLITERAL;
|
2013-02-27 22:54:14 +01:00
|
|
|
unit_status_printf(u, "", format);
|
2014-02-20 18:18:32 +01:00
|
|
|
REENABLE_WARNING;
|
2012-05-13 18:18:54 +02:00
|
|
|
}
|
|
|
|
|
2012-08-24 22:21:20 +02:00
|
|
|
static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
|
|
|
|
const char *format;
|
|
|
|
char buf[LINE_MAX];
|
|
|
|
sd_id128_t mid;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2015-11-17 17:11:44 +01:00
|
|
|
if (!IN_SET(t, JOB_START, JOB_STOP, JOB_RELOAD))
|
2012-08-24 22:21:20 +02:00
|
|
|
return;
|
|
|
|
|
2012-08-24 22:43:33 +02:00
|
|
|
if (log_on_console())
|
|
|
|
return;
|
|
|
|
|
2012-08-24 22:21:20 +02:00
|
|
|
/* We log status messages for all units and all operations. */
|
|
|
|
|
2015-07-20 17:18:13 +02:00
|
|
|
format = unit_get_status_message_format(u, t);
|
2012-08-24 22:21:20 +02:00
|
|
|
|
2014-02-20 18:18:32 +01:00
|
|
|
DISABLE_WARNING_FORMAT_NONLITERAL;
|
2016-01-12 15:34:20 +01:00
|
|
|
xsprintf(buf, format, unit_description(u));
|
2014-02-20 18:18:32 +01:00
|
|
|
REENABLE_WARNING;
|
2012-08-24 22:21:20 +02:00
|
|
|
|
|
|
|
mid = t == JOB_START ? SD_MESSAGE_UNIT_STARTING :
|
|
|
|
t == JOB_STOP ? SD_MESSAGE_UNIT_STOPPING :
|
|
|
|
SD_MESSAGE_UNIT_RELOADING;
|
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
/* Note that we deliberately use LOG_MESSAGE() instead of
|
|
|
|
* LOG_UNIT_MESSAGE() here, since this is supposed to mimic
|
|
|
|
* closely what is written to screen using the status output,
|
|
|
|
* which is supposed the highest level, friendliest output
|
|
|
|
* possible, which means we should avoid the low-level unit
|
|
|
|
* name. */
|
|
|
|
log_struct(LOG_INFO,
|
|
|
|
LOG_MESSAGE_ID(mid),
|
|
|
|
LOG_UNIT_ID(u),
|
|
|
|
LOG_MESSAGE("%s", buf),
|
|
|
|
NULL);
|
2012-08-24 22:21:20 +02:00
|
|
|
}
|
|
|
|
|
2015-07-16 20:08:30 +02:00
|
|
|
void unit_status_emit_starting_stopping_reloading(Unit *u, JobType t) {
|
2015-11-17 17:11:44 +01:00
|
|
|
assert(u);
|
|
|
|
assert(t >= 0);
|
|
|
|
assert(t < _JOB_TYPE_MAX);
|
2015-07-16 20:08:30 +02:00
|
|
|
|
|
|
|
unit_status_log_starting_stopping_reloading(u, t);
|
2015-11-17 17:11:44 +01:00
|
|
|
unit_status_print_starting_stopping(u, t);
|
2015-07-16 20:08:30 +02:00
|
|
|
}
|
|
|
|
|
core: move enforcement of the start limit into per-unit-type code again
Let's move the enforcement of the per-unit start limit from unit.c into the
type-specific files again. For unit types that know a concept of "result" codes
this allows us to hook up the start limit condition to it with an explicit
result code. Also, this makes sure that the state checks in clal like
service_start() may be done before the start limit is checked, as the start
limit really should be checked last, right before everything has been verified
to be in order.
The generic start limit logic is left in unit.c, but the invocation of it is
moved into the per-type files, in the various xyz_start() functions, so that
they may place the check at the right location.
Note that this change drops the enforcement entirely from device, slice, target
and scope units, since these unit types generally may not fail activation, or
may only be activated a single time. This is also documented now.
Note that restores the "start-limit-hit" result code that existed before
6bf0f408e4833152197fb38fb10a9989c89f3a59 already in the service code. However,
it's not introduced for all units that have a result code concept.
Fixes #3166.
2016-05-02 13:01:26 +02:00
|
|
|
int unit_start_limit_test(Unit *u) {
|
core: make the StartLimitXYZ= settings generic and apply to any kind of unit, not just services
This moves the StartLimitBurst=, StartLimitInterval=, StartLimitAction=, RebootArgument= from the [Service] section
into the [Unit] section of unit files, and thus support it in all unit types, not just in services.
This way we can enforce the start limit much earlier, in particular before testing the unit conditions, so that
repeated start-up failure due to failed conditions is also considered for the start limit logic.
For compatibility the four options may also be configured in the [Service] section still, but we only document them in
their new section [Unit].
This also renamed the socket unit failure code "service-failed-permanent" into "service-start-limit-hit" to express
more clearly what it is about, after all it's only triggered through the start limit being hit.
Finally, the code in busname_trigger_notify() and socket_trigger_notify() is altered to become more alike.
Fixes: #2467
2016-02-09 18:38:03 +01:00
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (ratelimit_test(&u->start_limit)) {
|
|
|
|
u->start_limit_hit = false;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
log_unit_warning(u, "Start request repeated too quickly.");
|
|
|
|
u->start_limit_hit = true;
|
|
|
|
|
|
|
|
return failure_action(u->manager, u->start_limit_action, u->reboot_arg);
|
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* Errors:
|
core: make the StartLimitXYZ= settings generic and apply to any kind of unit, not just services
This moves the StartLimitBurst=, StartLimitInterval=, StartLimitAction=, RebootArgument= from the [Service] section
into the [Unit] section of unit files, and thus support it in all unit types, not just in services.
This way we can enforce the start limit much earlier, in particular before testing the unit conditions, so that
repeated start-up failure due to failed conditions is also considered for the start limit logic.
For compatibility the four options may also be configured in the [Service] section still, but we only document them in
their new section [Unit].
This also renamed the socket unit failure code "service-failed-permanent" into "service-start-limit-hit" to express
more clearly what it is about, after all it's only triggered through the start limit being hit.
Finally, the code in busname_trigger_notify() and socket_trigger_notify() is altered to become more alike.
Fixes: #2467
2016-02-09 18:38:03 +01:00
|
|
|
* -EBADR: This unit type does not support starting.
|
|
|
|
* -EALREADY: Unit is already started.
|
|
|
|
* -EAGAIN: An operation is already in progress. Retry later.
|
|
|
|
* -ECANCELED: Too many requests for now.
|
|
|
|
* -EPROTO: Assert failed
|
|
|
|
* -EINVAL: Unit not loaded
|
|
|
|
* -EOPNOTSUPP: Unit type not supported
|
2010-01-26 21:39:06 +01:00
|
|
|
*/
|
|
|
|
int unit_start(Unit *u) {
|
|
|
|
UnitActiveState state;
|
2010-11-14 23:26:53 +01:00
|
|
|
Unit *following;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2011-09-22 21:32:18 +02:00
|
|
|
/* If this is already started, then this will succeed. Note
|
|
|
|
* that this will even succeed if this unit is not startable
|
|
|
|
* by the user. This is relied on to detect when we need to
|
|
|
|
* wait for units and when waiting is finished. */
|
2010-01-26 21:39:06 +01:00
|
|
|
state = unit_active_state(u);
|
|
|
|
if (UNIT_IS_ACTIVE_OR_RELOADING(state))
|
|
|
|
return -EALREADY;
|
|
|
|
|
core: make the StartLimitXYZ= settings generic and apply to any kind of unit, not just services
This moves the StartLimitBurst=, StartLimitInterval=, StartLimitAction=, RebootArgument= from the [Service] section
into the [Unit] section of unit files, and thus support it in all unit types, not just in services.
This way we can enforce the start limit much earlier, in particular before testing the unit conditions, so that
repeated start-up failure due to failed conditions is also considered for the start limit logic.
For compatibility the four options may also be configured in the [Service] section still, but we only document them in
their new section [Unit].
This also renamed the socket unit failure code "service-failed-permanent" into "service-start-limit-hit" to express
more clearly what it is about, after all it's only triggered through the start limit being hit.
Finally, the code in busname_trigger_notify() and socket_trigger_notify() is altered to become more alike.
Fixes: #2467
2016-02-09 18:38:03 +01:00
|
|
|
/* Units that aren't loaded cannot be started */
|
|
|
|
if (u->load_state != UNIT_LOADED)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2011-09-22 21:32:18 +02:00
|
|
|
/* If the conditions failed, don't do anything at all. If we
|
|
|
|
* already are activating this call might still be useful to
|
|
|
|
* speed up activation in case there is some hold-off time,
|
|
|
|
* but we don't want to recheck the condition in that case. */
|
|
|
|
if (state != UNIT_ACTIVATING &&
|
|
|
|
!unit_condition_test(u)) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Starting requested but condition failed. Not starting unit.");
|
2010-10-13 02:15:41 +02:00
|
|
|
return -EALREADY;
|
|
|
|
}
|
|
|
|
|
2014-11-06 13:43:45 +01:00
|
|
|
/* If the asserts failed, fail the entire job */
|
|
|
|
if (state != UNIT_ACTIVATING &&
|
|
|
|
!unit_assert_test(u)) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_notice(u, "Starting requested but asserts failed.");
|
2014-11-06 13:43:45 +01:00
|
|
|
return -EPROTO;
|
|
|
|
}
|
|
|
|
|
2015-09-07 14:08:24 +02:00
|
|
|
/* Units of types that aren't supported cannot be
|
|
|
|
* started. Note that we do this test only after the condition
|
|
|
|
* checks, so that we rather return condition check errors
|
|
|
|
* (which are usually not considered a true failure) than "not
|
|
|
|
* supported" errors (which are considered a failure).
|
|
|
|
*/
|
|
|
|
if (!unit_supported(u))
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2010-11-14 23:26:53 +01:00
|
|
|
/* Forward to the main object, if we aren't it. */
|
systemd,systemctl: export condition status and show failing condition
$ systemctl --user status hoohoo
hoohoo.service
Loaded: loaded (/home/zbyszek/.config/systemd/user/hoohoo.service; static)
Active: inactive (dead)
start condition failed at Tue 2013-06-25 18:08:42 EDT; 1s ago
ConditionPathExists=/tmp/hoo was not met
Full information is exported over D-Bus:
[(condition, trigger, negate, param, state),...]
where state is one of "failed" (<0), "untested" (0), "OK" (>0).
I've decided to use 0 for "untested", because it might be useful to
differentiate different types of failure later on, without breaking
compatibility.
systemctl shows the failing condition, if there was a non-trigger
failing condition, or says "none of the trigger conditions were met",
because there're often many trigger conditions, and they must all
fail for the condition to fail, so printing them all would consume
a lot of space, and bring unnecessary attention to something that is
quite low-level.
2013-06-25 22:09:07 +02:00
|
|
|
following = unit_following(u);
|
|
|
|
if (following) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Redirecting start request from %s to %s.", u->id, following->id);
|
2010-11-14 23:26:53 +01:00
|
|
|
return unit_start(following);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If it is stopped, but we cannot start it, then fail */
|
|
|
|
if (!UNIT_VTABLE(u)->start)
|
|
|
|
return -EBADR;
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* We don't suppress calls to ->start() here when we are
|
|
|
|
* already starting, to allow this request to be used as a
|
|
|
|
* "hurry up" call, for example when the unit is in some "auto
|
|
|
|
* restart" state where it waits for a holdoff timer to elapse
|
|
|
|
* before it will start again. */
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2010-07-07 00:00:59 +02:00
|
|
|
|
2015-07-16 20:08:30 +02:00
|
|
|
return UNIT_VTABLE(u)->start(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool unit_can_start(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2015-09-05 20:21:46 +02:00
|
|
|
if (u->load_state != UNIT_LOADED)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!unit_supported(u))
|
|
|
|
return false;
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
return !!UNIT_VTABLE(u)->start;
|
|
|
|
}
|
|
|
|
|
2010-08-30 22:45:46 +02:00
|
|
|
bool unit_can_isolate(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
return unit_can_start(u) &&
|
2012-01-15 12:04:08 +01:00
|
|
|
u->allow_isolate;
|
2010-08-30 22:45:46 +02:00
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* Errors:
|
|
|
|
* -EBADR: This unit type does not support stopping.
|
|
|
|
* -EALREADY: Unit is already stopped.
|
|
|
|
* -EAGAIN: An operation is already in progress. Retry later.
|
|
|
|
*/
|
|
|
|
int unit_stop(Unit *u) {
|
|
|
|
UnitActiveState state;
|
2010-11-14 23:26:53 +01:00
|
|
|
Unit *following;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
state = unit_active_state(u);
|
2010-08-31 00:23:34 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(state))
|
2010-01-26 21:39:06 +01:00
|
|
|
return -EALREADY;
|
|
|
|
|
2014-12-12 21:05:32 +01:00
|
|
|
following = unit_following(u);
|
|
|
|
if (following) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Redirecting stop request from %s to %s.", u->id, following->id);
|
2010-11-14 23:26:53 +01:00
|
|
|
return unit_stop(following);
|
|
|
|
}
|
|
|
|
|
2010-02-12 02:40:28 +01:00
|
|
|
if (!UNIT_VTABLE(u)->stop)
|
|
|
|
return -EBADR;
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2010-07-07 00:00:59 +02:00
|
|
|
|
2015-07-16 20:08:30 +02:00
|
|
|
return UNIT_VTABLE(u)->stop(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Errors:
|
|
|
|
* -EBADR: This unit type does not support reloading.
|
|
|
|
* -ENOEXEC: Unit is not started.
|
|
|
|
* -EAGAIN: An operation is already in progress. Retry later.
|
|
|
|
*/
|
|
|
|
int unit_reload(Unit *u) {
|
|
|
|
UnitActiveState state;
|
2010-11-14 23:26:53 +01:00
|
|
|
Unit *following;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->load_state != UNIT_LOADED)
|
2010-07-01 00:31:53 +02:00
|
|
|
return -EINVAL;
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
if (!unit_can_reload(u))
|
|
|
|
return -EBADR;
|
|
|
|
|
|
|
|
state = unit_active_state(u);
|
2010-08-11 22:04:22 +02:00
|
|
|
if (state == UNIT_RELOADING)
|
2010-01-26 21:39:06 +01:00
|
|
|
return -EALREADY;
|
|
|
|
|
2013-12-03 03:52:51 +01:00
|
|
|
if (state != UNIT_ACTIVE) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_warning(u, "Unit cannot be reloaded because it is inactive.");
|
2010-01-26 21:39:06 +01:00
|
|
|
return -ENOEXEC;
|
2013-12-03 03:52:51 +01:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-10-22 01:54:10 +02:00
|
|
|
following = unit_following(u);
|
|
|
|
if (following) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Redirecting reload request from %s to %s.", u->id, following->id);
|
2010-11-14 23:26:53 +01:00
|
|
|
return unit_reload(following);
|
|
|
|
}
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2015-01-28 15:07:13 +01:00
|
|
|
|
2015-07-16 20:08:30 +02:00
|
|
|
return UNIT_VTABLE(u)->reload(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool unit_can_reload(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (!UNIT_VTABLE(u)->reload)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!UNIT_VTABLE(u)->can_reload)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return UNIT_VTABLE(u)->can_reload(u);
|
|
|
|
}
|
|
|
|
|
2010-09-27 23:27:21 +02:00
|
|
|
static void unit_check_unneeded(Unit *u) {
|
2015-05-19 01:24:28 +02:00
|
|
|
|
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
GLIB has recently started to officially support the gcc cleanup
attribute in its public API, hence let's do the same for our APIs.
With this patch we'll define an xyz_unrefp() call for each public
xyz_unref() call, to make it easy to use inside a
__attribute__((cleanup())) expression. Then, all code is ported over to
make use of this.
The new calls are also documented in the man pages, with examples how to
use them (well, I only added docs where the _unref() call itself already
had docs, and the examples, only cover sd_bus_unrefp() and
sd_event_unrefp()).
This also renames sd_lldp_free() to sd_lldp_unref(), since that's how we
tend to call our destructors these days.
Note that this defines no public macro that wraps gcc's attribute and
makes it easier to use. While I think it's our duty in the library to
make our stuff easy to use, I figure it's not our duty to make gcc's own
features easy to use on its own. Most likely, client code which wants to
make use of this should define its own:
#define _cleanup_(function) __attribute__((cleanup(function)))
Or similar, to make the gcc feature easier to use.
Making this logic public has the benefit that we can remove three header
files whose only purpose was to define these functions internally.
See #2008.
2015-11-27 19:13:45 +01:00
|
|
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
2015-11-12 19:52:31 +01:00
|
|
|
|
2015-05-19 01:24:28 +02:00
|
|
|
static const UnitDependency needed_dependencies[] = {
|
|
|
|
UNIT_REQUIRED_BY,
|
2015-06-23 11:13:13 +02:00
|
|
|
UNIT_REQUISITE_OF,
|
2015-05-19 01:24:28 +02:00
|
|
|
UNIT_WANTED_BY,
|
|
|
|
UNIT_BOUND_BY,
|
|
|
|
};
|
|
|
|
|
2010-01-29 20:47:09 +01:00
|
|
|
Unit *other;
|
2015-05-19 01:24:28 +02:00
|
|
|
Iterator i;
|
|
|
|
unsigned j;
|
|
|
|
int r;
|
2010-01-29 20:47:09 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
/* If this service shall be shut down when unneeded then do
|
|
|
|
* so. */
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->stop_when_unneeded)
|
2010-01-29 20:47:09 +01:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
|
|
|
|
return;
|
|
|
|
|
2015-05-19 01:24:28 +02:00
|
|
|
for (j = 0; j < ELEMENTSOF(needed_dependencies); j++)
|
2015-05-19 15:42:03 +02:00
|
|
|
SET_FOREACH(other, u->dependencies[needed_dependencies[j]], i)
|
2015-05-19 01:24:28 +02:00
|
|
|
if (unit_active_or_pending(other))
|
|
|
|
return;
|
2010-10-28 23:18:47 +02:00
|
|
|
|
2015-05-19 16:00:24 +02:00
|
|
|
/* If stopping a unit fails continously we might enter a stop
|
|
|
|
* loop here, hence stop acting on the service being
|
|
|
|
* unnecessary after a while. */
|
2015-05-19 16:23:14 +02:00
|
|
|
if (!ratelimit_test(&u->auto_stop_ratelimit)) {
|
2015-05-19 16:00:24 +02:00
|
|
|
log_unit_warning(u, "Unit not needed anymore, but not stopping since we tried this too often recently.");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_info(u, "Unit not needed anymore. Stopping.");
|
2010-01-29 20:47:09 +01:00
|
|
|
|
|
|
|
/* Ok, nobody needs us anymore. Sniff. Then let's commit suicide */
|
2015-11-12 19:52:31 +01:00
|
|
|
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, &error, NULL);
|
2015-05-19 01:24:28 +02:00
|
|
|
if (r < 0)
|
2015-11-12 19:52:31 +01:00
|
|
|
log_unit_warning_errno(u, r, "Failed to enqueue stop job, ignoring: %s", bus_error_message(&error, r));
|
2010-01-29 20:47:09 +01:00
|
|
|
}
|
|
|
|
|
2014-08-18 22:21:42 +02:00
|
|
|
static void unit_check_binds_to(Unit *u) {
|
tree-wide: expose "p"-suffix unref calls in public APIs to make gcc cleanup easy
GLIB has recently started to officially support the gcc cleanup
attribute in its public API, hence let's do the same for our APIs.
With this patch we'll define an xyz_unrefp() call for each public
xyz_unref() call, to make it easy to use inside a
__attribute__((cleanup())) expression. Then, all code is ported over to
make use of this.
The new calls are also documented in the man pages, with examples how to
use them (well, I only added docs where the _unref() call itself already
had docs, and the examples, only cover sd_bus_unrefp() and
sd_event_unrefp()).
This also renames sd_lldp_free() to sd_lldp_unref(), since that's how we
tend to call our destructors these days.
Note that this defines no public macro that wraps gcc's attribute and
makes it easier to use. While I think it's our duty in the library to
make our stuff easy to use, I figure it's not our duty to make gcc's own
features easy to use on its own. Most likely, client code which wants to
make use of this should define its own:
#define _cleanup_(function) __attribute__((cleanup(function)))
Or similar, to make the gcc feature easier to use.
Making this logic public has the benefit that we can remove three header
files whose only purpose was to define these functions internally.
See #2008.
2015-11-27 19:13:45 +01:00
|
|
|
_cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
|
2014-08-18 22:21:42 +02:00
|
|
|
bool stop = false;
|
|
|
|
Unit *other;
|
|
|
|
Iterator i;
|
2015-05-19 16:23:14 +02:00
|
|
|
int r;
|
2014-08-18 22:21:42 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (u->job)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (unit_active_state(u) != UNIT_ACTIVE)
|
|
|
|
return;
|
|
|
|
|
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_BINDS_TO], i) {
|
|
|
|
if (other->job)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!UNIT_IS_INACTIVE_OR_FAILED(unit_active_state(other)))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
stop = true;
|
2015-02-17 19:47:34 +01:00
|
|
|
break;
|
2014-08-18 22:21:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!stop)
|
|
|
|
return;
|
|
|
|
|
2015-05-19 16:23:14 +02:00
|
|
|
/* If stopping a unit fails continously we might enter a stop
|
|
|
|
* loop here, hence stop acting on the service being
|
|
|
|
* unnecessary after a while. */
|
|
|
|
if (!ratelimit_test(&u->auto_stop_ratelimit)) {
|
|
|
|
log_unit_warning(u, "Unit is bound to inactive unit %s, but not stopping since we tried this too often recently.", other->id);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-02-17 19:47:34 +01:00
|
|
|
assert(other);
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id);
|
2014-08-18 22:21:42 +02:00
|
|
|
|
|
|
|
/* A unit we need to run is gone. Sniff. Let's stop this. */
|
2015-11-12 19:52:31 +01:00
|
|
|
r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, &error, NULL);
|
2015-05-19 16:23:14 +02:00
|
|
|
if (r < 0)
|
2015-11-12 19:52:31 +01:00
|
|
|
log_unit_warning_errno(u, r, "Failed to enqueue stop job, ignoring: %s", bus_error_message(&error, r));
|
2014-08-18 22:21:42 +02:00
|
|
|
}
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
static void retroactively_start_dependencies(Unit *u) {
|
|
|
|
Iterator i;
|
|
|
|
Unit *other;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)));
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i)
|
|
|
|
if (!set_get(u->dependencies[UNIT_AFTER], other) &&
|
2010-10-28 23:18:47 +02:00
|
|
|
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
|
2015-11-12 19:52:31 +01:00
|
|
|
manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, NULL, NULL);
|
2010-10-28 23:18:47 +02:00
|
|
|
|
2012-07-13 23:34:40 +02:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_BINDS_TO], i)
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!set_get(u->dependencies[UNIT_AFTER], other) &&
|
2010-10-28 23:18:47 +02:00
|
|
|
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
|
2015-11-12 19:52:31 +01:00
|
|
|
manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, NULL, NULL);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
|
|
|
|
if (!set_get(u->dependencies[UNIT_AFTER], other) &&
|
2010-10-28 23:18:47 +02:00
|
|
|
!UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
|
2015-11-12 19:52:31 +01:00
|
|
|
manager_add_job(u->manager, JOB_START, other, JOB_FAIL, NULL, NULL);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_CONFLICTS], i)
|
2010-10-28 23:18:47 +02:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
2015-11-12 19:52:31 +01:00
|
|
|
manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, NULL, NULL);
|
2010-08-09 22:32:30 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_CONFLICTED_BY], i)
|
2010-10-28 23:18:47 +02:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
2015-11-12 19:52:31 +01:00
|
|
|
manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, NULL, NULL);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void retroactively_stop_dependencies(Unit *u) {
|
|
|
|
Iterator i;
|
|
|
|
Unit *other;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
|
|
|
|
|
2010-10-28 23:18:47 +02:00
|
|
|
/* Pull down units which are bound to us recursively if enabled */
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_BOUND_BY], i)
|
2010-10-28 23:18:47 +02:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
2015-11-12 19:52:31 +01:00
|
|
|
manager_add_job(u->manager, JOB_STOP, other, JOB_REPLACE, NULL, NULL);
|
2011-12-09 15:25:29 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void check_unneeded_dependencies(Unit *u) {
|
|
|
|
Iterator i;
|
|
|
|
Unit *other;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)));
|
2010-01-29 20:47:09 +01:00
|
|
|
|
|
|
|
/* Garbage collect services that might not be needed anymore, if enabled */
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_REQUIRES], i)
|
2010-01-26 21:39:06 +01:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
2010-09-27 23:27:21 +02:00
|
|
|
unit_check_unneeded(other);
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
|
2010-01-29 20:47:09 +01:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
2010-09-27 23:27:21 +02:00
|
|
|
unit_check_unneeded(other);
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i)
|
2010-01-29 20:47:09 +01:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
2010-09-27 23:27:21 +02:00
|
|
|
unit_check_unneeded(other);
|
2012-07-13 23:34:40 +02:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_BINDS_TO], i)
|
2010-10-28 23:18:47 +02:00
|
|
|
if (!UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(other)))
|
|
|
|
unit_check_unneeded(other);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2013-04-23 20:53:16 +02:00
|
|
|
void unit_start_on_failure(Unit *u) {
|
2011-02-24 03:24:23 +01:00
|
|
|
Unit *other;
|
|
|
|
Iterator i;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (set_size(u->dependencies[UNIT_ON_FAILURE]) <= 0)
|
2011-04-07 04:11:31 +02:00
|
|
|
return;
|
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_info(u, "Triggering OnFailure= dependencies.");
|
2011-04-07 04:11:31 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_ON_FAILURE], i) {
|
2011-04-07 04:11:31 +02:00
|
|
|
int r;
|
|
|
|
|
2015-11-12 19:52:31 +01:00
|
|
|
r = manager_add_job(u->manager, JOB_START, other, u->on_failure_job_mode, NULL, NULL);
|
2013-04-15 07:40:44 +02:00
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_error_errno(u, r, "Failed to enqueue OnFailure= job: %m");
|
2011-04-07 04:11:31 +02:00
|
|
|
}
|
2011-02-24 03:24:23 +01:00
|
|
|
}
|
|
|
|
|
2013-04-23 20:53:16 +02:00
|
|
|
void unit_trigger_notify(Unit *u) {
|
|
|
|
Unit *other;
|
|
|
|
Iterator i;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_TRIGGERED_BY], i)
|
|
|
|
if (UNIT_VTABLE(other)->trigger_notify)
|
|
|
|
UNIT_VTABLE(other)->trigger_notify(other, u);
|
|
|
|
}
|
|
|
|
|
2011-01-20 13:17:22 +01:00
|
|
|
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_success) {
|
2013-02-27 23:58:10 +01:00
|
|
|
Manager *m;
|
2010-07-13 02:17:53 +02:00
|
|
|
bool unexpected;
|
2010-04-08 01:22:51 +02:00
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
assert(u);
|
|
|
|
assert(os < _UNIT_ACTIVE_STATE_MAX);
|
|
|
|
assert(ns < _UNIT_ACTIVE_STATE_MAX);
|
|
|
|
|
2010-04-10 04:45:44 +02:00
|
|
|
/* Note that this is called for all low-level state changes,
|
|
|
|
* even if they might map to the same high-level
|
2014-05-23 20:56:42 +02:00
|
|
|
* UnitActiveState! That means that ns == os is an expected
|
2012-09-04 19:24:16 +02:00
|
|
|
* behavior here. For example: if a mount point is remounted
|
2010-08-11 04:38:55 +02:00
|
|
|
* this function will be called too! */
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-02-27 23:58:10 +01:00
|
|
|
m = u->manager;
|
|
|
|
|
2014-03-12 20:55:13 +01:00
|
|
|
/* Update timestamps for state changes */
|
2016-02-24 21:36:09 +01:00
|
|
|
if (!MANAGER_IS_RELOADING(m)) {
|
2016-02-01 16:01:25 +01:00
|
|
|
dual_timestamp_get(&u->state_change_timestamp);
|
2010-05-14 03:05:38 +02:00
|
|
|
|
2011-03-30 20:04:20 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(os) && !UNIT_IS_INACTIVE_OR_FAILED(ns))
|
2016-02-01 16:01:25 +01:00
|
|
|
u->inactive_exit_timestamp = u->state_change_timestamp;
|
2011-03-30 20:04:20 +02:00
|
|
|
else if (!UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_INACTIVE_OR_FAILED(ns))
|
2016-02-01 16:01:25 +01:00
|
|
|
u->inactive_enter_timestamp = u->state_change_timestamp;
|
2011-03-30 20:04:20 +02:00
|
|
|
|
|
|
|
if (!UNIT_IS_ACTIVE_OR_RELOADING(os) && UNIT_IS_ACTIVE_OR_RELOADING(ns))
|
2016-02-01 16:01:25 +01:00
|
|
|
u->active_enter_timestamp = u->state_change_timestamp;
|
2011-03-30 20:04:20 +02:00
|
|
|
else if (UNIT_IS_ACTIVE_OR_RELOADING(os) && !UNIT_IS_ACTIVE_OR_RELOADING(ns))
|
2016-02-01 16:01:25 +01:00
|
|
|
u->active_exit_timestamp = u->state_change_timestamp;
|
2011-03-30 20:04:20 +02:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-05-23 20:56:42 +02:00
|
|
|
/* Keep track of failed units */
|
2015-09-11 17:25:35 +02:00
|
|
|
(void) manager_update_failed_units(u->manager, u, ns == UNIT_FAILED);
|
2014-03-12 20:55:13 +01:00
|
|
|
|
|
|
|
/* Make sure the cgroup is always removed when we become inactive */
|
2010-08-31 00:23:34 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
unit_prune_cgroup(u);
|
2010-07-10 17:34:42 +02:00
|
|
|
|
2013-11-14 15:52:54 +01:00
|
|
|
/* Note that this doesn't apply to RemainAfterExit services exiting
|
2014-03-14 21:13:38 +01:00
|
|
|
* successfully, since there's no change of state in that case. Which is
|
2013-11-14 15:52:54 +01:00
|
|
|
* why it is handled in service_set_state() */
|
2013-02-28 00:01:10 +01:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(os) != UNIT_IS_INACTIVE_OR_FAILED(ns)) {
|
2014-02-13 02:12:27 +01:00
|
|
|
ExecContext *ec;
|
|
|
|
|
|
|
|
ec = unit_get_exec_context(u);
|
2013-02-28 00:01:10 +01:00
|
|
|
if (ec && exec_context_may_touch_console(ec)) {
|
systemd: do not output status messages once gettys are running
Make Type=idle communication bidirectional: when bootup is finished,
the manager, as before, signals idling Type=idle jobs to continue.
However, if the boot takes too long, idling jobs signal the manager
that they have had enough, wait a tiny bit more, and continue, taking
ownership of the console. The manager, when signalled that Type=idle
jobs are done, makes a note and will not write to the console anymore.
This is a cosmetic issue, but quite noticable, so let's just fix it.
Based on Harald Hoyer's patch.
https://bugs.freedesktop.org/show_bug.cgi?id=54247
http://unix.stackexchange.com/questions/51805/systemd-messages-after-starting-login/
2013-07-16 03:34:57 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(ns)) {
|
2016-02-23 05:32:04 +01:00
|
|
|
m->n_on_console--;
|
systemd: do not output status messages once gettys are running
Make Type=idle communication bidirectional: when bootup is finished,
the manager, as before, signals idling Type=idle jobs to continue.
However, if the boot takes too long, idling jobs signal the manager
that they have had enough, wait a tiny bit more, and continue, taking
ownership of the console. The manager, when signalled that Type=idle
jobs are done, makes a note and will not write to the console anymore.
This is a cosmetic issue, but quite noticable, so let's just fix it.
Based on Harald Hoyer's patch.
https://bugs.freedesktop.org/show_bug.cgi?id=54247
http://unix.stackexchange.com/questions/51805/systemd-messages-after-starting-login/
2013-07-16 03:34:57 +02:00
|
|
|
|
|
|
|
if (m->n_on_console == 0)
|
|
|
|
/* unset no_console_output flag, since the console is free */
|
2013-09-20 22:18:29 +02:00
|
|
|
m->no_console_output = false;
|
systemd: do not output status messages once gettys are running
Make Type=idle communication bidirectional: when bootup is finished,
the manager, as before, signals idling Type=idle jobs to continue.
However, if the boot takes too long, idling jobs signal the manager
that they have had enough, wait a tiny bit more, and continue, taking
ownership of the console. The manager, when signalled that Type=idle
jobs are done, makes a note and will not write to the console anymore.
This is a cosmetic issue, but quite noticable, so let's just fix it.
Based on Harald Hoyer's patch.
https://bugs.freedesktop.org/show_bug.cgi?id=54247
http://unix.stackexchange.com/questions/51805/systemd-messages-after-starting-login/
2013-07-16 03:34:57 +02:00
|
|
|
} else
|
2016-02-23 05:32:04 +01:00
|
|
|
m->n_on_console++;
|
2013-02-28 00:01:10 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->job) {
|
2010-07-13 02:17:53 +02:00
|
|
|
unexpected = false;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->job->state == JOB_WAITING)
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
/* So we reached a different state for this
|
|
|
|
* job. Let's see if we can run it now if it
|
|
|
|
* failed previously due to EAGAIN. */
|
2012-01-15 12:04:08 +01:00
|
|
|
job_add_to_run_queue(u->job);
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
/* Let's check whether this state change constitutes a
|
2011-02-21 15:32:17 +01:00
|
|
|
* finished job, or maybe contradicts a running job and
|
2010-06-04 20:13:05 +02:00
|
|
|
* hence needs to invalidate jobs. */
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
switch (u->job->type) {
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
case JOB_START:
|
|
|
|
case JOB_VERIFY_ACTIVE:
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
if (UNIT_IS_ACTIVE_OR_RELOADING(ns))
|
2012-04-24 11:21:03 +02:00
|
|
|
job_finish_and_invalidate(u->job, JOB_DONE, true);
|
2012-01-15 12:04:08 +01:00
|
|
|
else if (u->job->state == JOB_RUNNING && ns != UNIT_ACTIVATING) {
|
2010-06-04 20:13:05 +02:00
|
|
|
unexpected = true;
|
2010-08-11 04:02:58 +02:00
|
|
|
|
2010-08-31 00:23:34 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
|
2012-04-24 11:21:03 +02:00
|
|
|
job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE, true);
|
2010-06-04 20:13:05 +02:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
break;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
case JOB_RELOAD:
|
|
|
|
case JOB_RELOAD_OR_START:
|
2016-01-28 18:48:42 +01:00
|
|
|
case JOB_TRY_RELOAD:
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->job->state == JOB_RUNNING) {
|
2010-04-08 01:22:51 +02:00
|
|
|
if (ns == UNIT_ACTIVE)
|
2012-04-24 11:21:03 +02:00
|
|
|
job_finish_and_invalidate(u->job, reload_success ? JOB_DONE : JOB_FAILED, true);
|
2010-07-01 03:34:15 +02:00
|
|
|
else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
|
2010-04-08 01:22:51 +02:00
|
|
|
unexpected = true;
|
2010-08-11 04:02:58 +02:00
|
|
|
|
2010-08-31 00:23:34 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
|
2012-04-24 11:21:03 +02:00
|
|
|
job_finish_and_invalidate(u->job, ns == UNIT_FAILED ? JOB_FAILED : JOB_DONE, true);
|
2010-04-08 01:22:51 +02:00
|
|
|
}
|
2010-06-04 20:13:05 +02:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
break;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
case JOB_STOP:
|
|
|
|
case JOB_RESTART:
|
|
|
|
case JOB_TRY_RESTART:
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-08-31 00:23:34 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(ns))
|
2012-04-24 11:21:03 +02:00
|
|
|
job_finish_and_invalidate(u->job, JOB_DONE, true);
|
2012-01-15 12:04:08 +01:00
|
|
|
else if (u->job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
|
2010-06-04 20:13:05 +02:00
|
|
|
unexpected = true;
|
2012-04-24 11:21:03 +02:00
|
|
|
job_finish_and_invalidate(u->job, JOB_FAILED, true);
|
2010-06-04 20:13:05 +02:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
break;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2010-06-04 20:13:05 +02:00
|
|
|
default:
|
|
|
|
assert_not_reached("Job type unknown");
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2010-07-13 02:17:53 +02:00
|
|
|
} else
|
|
|
|
unexpected = true;
|
|
|
|
|
2016-02-24 21:36:09 +01:00
|
|
|
if (!MANAGER_IS_RELOADING(m)) {
|
2010-01-29 20:47:09 +01:00
|
|
|
|
2011-03-30 20:04:20 +02:00
|
|
|
/* If this state change happened without being
|
|
|
|
* requested by a job, then let's retroactively start
|
|
|
|
* or stop dependencies. We skip that step when
|
|
|
|
* deserializing, since we don't want to create any
|
|
|
|
* additional jobs just because something is already
|
|
|
|
* activated. */
|
|
|
|
|
|
|
|
if (unexpected) {
|
|
|
|
if (UNIT_IS_INACTIVE_OR_FAILED(os) && UNIT_IS_ACTIVE_OR_ACTIVATING(ns))
|
|
|
|
retroactively_start_dependencies(u);
|
|
|
|
else if (UNIT_IS_ACTIVE_OR_ACTIVATING(os) && UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
|
|
|
|
retroactively_stop_dependencies(u);
|
|
|
|
}
|
2010-07-17 00:58:47 +02:00
|
|
|
|
2011-12-09 15:25:29 +01:00
|
|
|
/* stop unneeded units regardless if going down was expected or not */
|
2014-02-13 02:12:27 +01:00
|
|
|
if (UNIT_IS_INACTIVE_OR_DEACTIVATING(ns))
|
2011-12-09 15:25:29 +01:00
|
|
|
check_unneeded_dependencies(u);
|
|
|
|
|
2011-03-30 20:04:20 +02:00
|
|
|
if (ns != os && ns == UNIT_FAILED) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_notice(u, "Unit entered failed state.");
|
2013-04-23 20:53:16 +02:00
|
|
|
unit_start_on_failure(u);
|
2010-08-11 04:38:55 +02:00
|
|
|
}
|
2011-03-30 20:16:07 +02:00
|
|
|
}
|
2010-04-10 17:53:17 +02:00
|
|
|
|
2011-03-30 20:16:07 +02:00
|
|
|
/* Some names are special */
|
|
|
|
if (UNIT_IS_ACTIVE_OR_RELOADING(ns)) {
|
|
|
|
|
|
|
|
if (unit_has_name(u, SPECIAL_DBUS_SERVICE))
|
2014-05-23 20:56:42 +02:00
|
|
|
/* The bus might have just become available,
|
2011-03-30 20:16:07 +02:00
|
|
|
* hence try to connect to it, if we aren't
|
|
|
|
* yet connected. */
|
2013-02-27 23:58:10 +01:00
|
|
|
bus_init(m, true);
|
2011-03-30 20:16:07 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->type == UNIT_SERVICE &&
|
2011-03-30 20:16:07 +02:00
|
|
|
!UNIT_IS_ACTIVE_OR_RELOADING(os) &&
|
2016-02-24 21:36:09 +01:00
|
|
|
!MANAGER_IS_RELOADING(m)) {
|
2011-03-30 20:16:07 +02:00
|
|
|
/* Write audit record if we have just finished starting up */
|
2013-02-27 23:58:10 +01:00
|
|
|
manager_send_unit_audit(m, u, AUDIT_SERVICE_START, true);
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_audit = true;
|
2011-03-30 20:16:07 +02:00
|
|
|
}
|
2010-10-06 03:55:49 +02:00
|
|
|
|
2011-03-30 20:16:07 +02:00
|
|
|
if (!UNIT_IS_ACTIVE_OR_RELOADING(os))
|
2013-02-27 23:58:10 +01:00
|
|
|
manager_send_unit_plymouth(m, u);
|
2011-03-30 20:04:20 +02:00
|
|
|
|
2011-03-30 20:16:07 +02:00
|
|
|
} else {
|
2011-03-30 20:04:20 +02:00
|
|
|
|
2011-03-30 20:16:07 +02:00
|
|
|
/* We don't care about D-Bus here, since we'll get an
|
|
|
|
* asynchronous notification for it anyway. */
|
2010-08-11 04:38:55 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->type == UNIT_SERVICE &&
|
2011-03-30 20:16:07 +02:00
|
|
|
UNIT_IS_INACTIVE_OR_FAILED(ns) &&
|
|
|
|
!UNIT_IS_INACTIVE_OR_FAILED(os) &&
|
2016-02-24 21:36:09 +01:00
|
|
|
!MANAGER_IS_RELOADING(m)) {
|
2010-08-11 01:43:23 +02:00
|
|
|
|
2011-03-30 20:16:07 +02:00
|
|
|
/* Hmm, if there was no start record written
|
|
|
|
* write it now, so that we always have a nice
|
|
|
|
* pair */
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->in_audit) {
|
2013-02-27 23:58:10 +01:00
|
|
|
manager_send_unit_audit(m, u, AUDIT_SERVICE_START, ns == UNIT_INACTIVE);
|
2010-08-11 04:38:55 +02:00
|
|
|
|
2011-03-30 20:16:07 +02:00
|
|
|
if (ns == UNIT_INACTIVE)
|
2013-02-27 23:58:10 +01:00
|
|
|
manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, true);
|
2011-03-30 20:16:07 +02:00
|
|
|
} else
|
|
|
|
/* Write audit record if we have just finished shutting down */
|
2013-02-27 23:58:10 +01:00
|
|
|
manager_send_unit_audit(m, u, AUDIT_SERVICE_STOP, ns == UNIT_INACTIVE);
|
2011-03-30 20:04:20 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
u->in_audit = false;
|
2010-08-11 04:38:55 +02:00
|
|
|
}
|
2010-04-06 16:32:07 +02:00
|
|
|
}
|
|
|
|
|
2013-02-27 23:58:10 +01:00
|
|
|
manager_recheck_journal(m);
|
2013-04-23 20:53:16 +02:00
|
|
|
unit_trigger_notify(u);
|
2011-03-30 20:16:07 +02:00
|
|
|
|
2016-02-24 21:36:09 +01:00
|
|
|
if (!MANAGER_IS_RELOADING(u->manager)) {
|
2014-08-18 22:21:42 +02:00
|
|
|
/* Maybe we finished startup and are now ready for
|
|
|
|
* being stopped because unneeded? */
|
2013-02-13 23:49:26 +01:00
|
|
|
unit_check_unneeded(u);
|
2010-02-05 00:38:41 +01:00
|
|
|
|
2014-08-18 22:21:42 +02:00
|
|
|
/* Maybe we finished startup, but something we needed
|
|
|
|
* has vanished? Let's die then. (This happens when
|
|
|
|
* something BindsTo= to a Type=oneshot unit, as these
|
|
|
|
* units go directly from starting to inactive,
|
|
|
|
* without ever entering started.) */
|
|
|
|
unit_check_binds_to(u);
|
|
|
|
}
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2010-04-21 06:01:13 +02:00
|
|
|
unit_add_to_gc_queue(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int unit_watch_pid(Unit *u, pid_t pid) {
|
2014-02-06 17:17:51 +01:00
|
|
|
int q, r;
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
assert(u);
|
|
|
|
assert(pid >= 1);
|
|
|
|
|
2014-02-07 11:58:25 +01:00
|
|
|
/* Watch a specific PID. We only support one or two units
|
|
|
|
* watching each PID for now, not more. */
|
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
r = set_ensure_allocated(&u->pids, NULL);
|
2014-02-07 11:58:25 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
r = hashmap_ensure_allocated(&u->manager->watch_pids1, NULL);
|
2014-02-06 17:17:51 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2015-09-03 13:22:51 +02:00
|
|
|
r = hashmap_put(u->manager->watch_pids1, PID_TO_PTR(pid), u);
|
2014-02-07 11:58:25 +01:00
|
|
|
if (r == -EEXIST) {
|
2014-08-13 01:00:18 +02:00
|
|
|
r = hashmap_ensure_allocated(&u->manager->watch_pids2, NULL);
|
2014-02-07 11:58:25 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-15 23:16:16 +02:00
|
|
|
|
2015-09-03 13:22:51 +02:00
|
|
|
r = hashmap_put(u->manager->watch_pids2, PID_TO_PTR(pid), u);
|
2014-02-07 11:58:25 +01:00
|
|
|
}
|
2014-02-06 17:17:51 +01:00
|
|
|
|
2015-09-03 13:22:51 +02:00
|
|
|
q = set_put(u->pids, PID_TO_PTR(pid));
|
2014-02-06 17:17:51 +01:00
|
|
|
if (q < 0)
|
|
|
|
return q;
|
|
|
|
|
|
|
|
return r;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void unit_unwatch_pid(Unit *u, pid_t pid) {
|
|
|
|
assert(u);
|
|
|
|
assert(pid >= 1);
|
|
|
|
|
2015-09-03 13:22:51 +02:00
|
|
|
(void) hashmap_remove_value(u->manager->watch_pids1, PID_TO_PTR(pid), u);
|
|
|
|
(void) hashmap_remove_value(u->manager->watch_pids2, PID_TO_PTR(pid), u);
|
|
|
|
(void) set_remove(u->pids, PID_TO_PTR(pid));
|
2014-02-06 17:17:51 +01:00
|
|
|
}
|
|
|
|
|
2014-03-06 02:19:42 +01:00
|
|
|
void unit_unwatch_all_pids(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
while (!set_isempty(u->pids))
|
2015-09-03 13:22:51 +02:00
|
|
|
unit_unwatch_pid(u, PTR_TO_PID(set_first(u->pids)));
|
2014-03-06 02:19:42 +01:00
|
|
|
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
u->pids = set_free(u->pids);
|
2014-02-06 17:17:51 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void unit_tidy_watch_pids(Unit *u, pid_t except1, pid_t except2) {
|
|
|
|
Iterator i;
|
|
|
|
void *e;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
/* Cleans dead PIDs from our list */
|
|
|
|
|
|
|
|
SET_FOREACH(e, u->pids, i) {
|
2015-09-03 13:22:51 +02:00
|
|
|
pid_t pid = PTR_TO_PID(e);
|
2014-02-06 17:17:51 +01:00
|
|
|
|
|
|
|
if (pid == except1 || pid == except2)
|
|
|
|
continue;
|
|
|
|
|
2014-02-17 18:28:53 +01:00
|
|
|
if (!pid_is_unwaited(pid))
|
2014-03-06 02:19:42 +01:00
|
|
|
unit_unwatch_pid(u, pid);
|
2014-02-06 17:17:51 +01:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool unit_job_is_applicable(Unit *u, JobType j) {
|
|
|
|
assert(u);
|
|
|
|
assert(j >= 0 && j < _JOB_TYPE_MAX);
|
|
|
|
|
|
|
|
switch (j) {
|
|
|
|
|
|
|
|
case JOB_VERIFY_ACTIVE:
|
|
|
|
case JOB_START:
|
2010-11-14 21:57:10 +01:00
|
|
|
case JOB_STOP:
|
core: add NOP jobs, job type collapsing
Two of our current job types are special:
JOB_TRY_RESTART, JOB_RELOAD_OR_START.
They differ from other job types by being sensitive to the unit active state.
They perform some action when the unit is active and some other action
otherwise. This raises a question: when exactly should the unit state be
checked to make the decision?
Currently the unit state is checked when the job becomes runnable. It's more
sensible to check the state immediately when the job is added by the user.
When the user types "systemctl try-restart foo.service", he really intends
to restart the service if it's running right now. If it isn't running right
now, the restart is pointless.
Consider the example (from Bugzilla[1]):
sleep.service takes some time to start.
hello.service has After=sleep.service.
Both services get started. Two jobs will appear:
hello.service/start waiting
sleep.service/start running
Then someone runs "systemctl try-restart hello.service".
Currently the try-restart operation will block and wait for
sleep.service/start to complete.
The correct result is to complete the try-restart operation immediately
with success, because hello.service is not running. The two original
jobs must not be disturbed by this.
To fix this we introduce two new concepts:
- a new job type: JOB_NOP
A JOB_NOP job does not do anything to the unit. It does not pull in any
dependencies. It is always immediately runnable. When installed to a unit,
it sits in a special slot (u->nop_job) where it never conflicts with
the installed job (u->job) of a different type. It never merges with jobs
of other types, but it can merge into an already installed JOB_NOP job.
- "collapsing" of job types
When a job of one of the two special types is added, the state of the unit
is checked immediately and the job type changes:
JOB_TRY_RESTART -> JOB_RESTART or JOB_NOP
JOB_RELOAD_OR_START -> JOB_RELOAD or JOB_START
Should a job type JOB_RELOAD_OR_START appear later during job merging, it
collapses immediately afterwards.
Collapsing actually makes some things simpler, because there are now fewer
job types that are allowed in the transaction.
[1] Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=753586
2012-04-25 11:58:27 +02:00
|
|
|
case JOB_NOP:
|
2010-01-26 21:39:06 +01:00
|
|
|
return true;
|
|
|
|
|
|
|
|
case JOB_RESTART:
|
|
|
|
case JOB_TRY_RESTART:
|
|
|
|
return unit_can_start(u);
|
|
|
|
|
|
|
|
case JOB_RELOAD:
|
2016-01-28 18:48:42 +01:00
|
|
|
case JOB_TRY_RELOAD:
|
2010-01-26 21:39:06 +01:00
|
|
|
return unit_can_reload(u);
|
|
|
|
|
|
|
|
case JOB_RELOAD_OR_START:
|
|
|
|
return unit_can_reload(u) && unit_can_start(u);
|
|
|
|
|
|
|
|
default:
|
|
|
|
assert_not_reached("Invalid job type");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
static void maybe_warn_about_dependency(Unit *u, const char *other, UnitDependency dependency) {
|
|
|
|
assert(u);
|
2014-08-08 02:46:49 +02:00
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
/* Only warn about some unit types */
|
|
|
|
if (!IN_SET(dependency, UNIT_CONFLICTS, UNIT_CONFLICTED_BY, UNIT_BEFORE, UNIT_AFTER, UNIT_ON_FAILURE, UNIT_TRIGGERS, UNIT_TRIGGERED_BY))
|
|
|
|
return;
|
2014-08-18 22:25:24 +02:00
|
|
|
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
if (streq_ptr(u->id, other))
|
|
|
|
log_unit_warning(u, "Dependency %s=%s dropped", unit_dependency_to_string(dependency), u->id);
|
|
|
|
else
|
|
|
|
log_unit_warning(u, "Dependency %s=%s dropped, merged into %s", unit_dependency_to_string(dependency), strna(other), u->id);
|
2014-08-08 02:46:49 +02:00
|
|
|
}
|
|
|
|
|
2010-04-21 06:01:13 +02:00
|
|
|
int unit_add_dependency(Unit *u, UnitDependency d, Unit *other, bool add_reference) {
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
static const UnitDependency inverse_table[_UNIT_DEPENDENCY_MAX] = {
|
|
|
|
[UNIT_REQUIRES] = UNIT_REQUIRED_BY,
|
|
|
|
[UNIT_WANTS] = UNIT_WANTED_BY,
|
2015-05-19 01:24:28 +02:00
|
|
|
[UNIT_REQUISITE] = UNIT_REQUISITE_OF,
|
2012-07-13 23:34:40 +02:00
|
|
|
[UNIT_BINDS_TO] = UNIT_BOUND_BY,
|
2012-07-26 09:42:26 +02:00
|
|
|
[UNIT_PART_OF] = UNIT_CONSISTS_OF,
|
2015-05-19 01:24:28 +02:00
|
|
|
[UNIT_REQUIRED_BY] = UNIT_REQUIRES,
|
|
|
|
[UNIT_REQUISITE_OF] = UNIT_REQUISITE,
|
|
|
|
[UNIT_WANTED_BY] = UNIT_WANTS,
|
2012-07-13 23:34:40 +02:00
|
|
|
[UNIT_BOUND_BY] = UNIT_BINDS_TO,
|
2012-07-26 09:42:26 +02:00
|
|
|
[UNIT_CONSISTS_OF] = UNIT_PART_OF,
|
2010-08-09 22:32:30 +02:00
|
|
|
[UNIT_CONFLICTS] = UNIT_CONFLICTED_BY,
|
|
|
|
[UNIT_CONFLICTED_BY] = UNIT_CONFLICTS,
|
2010-01-26 21:39:06 +01:00
|
|
|
[UNIT_BEFORE] = UNIT_AFTER,
|
2010-04-21 06:01:13 +02:00
|
|
|
[UNIT_AFTER] = UNIT_BEFORE,
|
2010-07-17 00:58:47 +02:00
|
|
|
[UNIT_ON_FAILURE] = _UNIT_DEPENDENCY_INVALID,
|
2010-04-21 06:01:13 +02:00
|
|
|
[UNIT_REFERENCES] = UNIT_REFERENCED_BY,
|
2012-01-06 23:08:54 +01:00
|
|
|
[UNIT_REFERENCED_BY] = UNIT_REFERENCES,
|
|
|
|
[UNIT_TRIGGERS] = UNIT_TRIGGERED_BY,
|
2012-01-11 02:47:14 +01:00
|
|
|
[UNIT_TRIGGERED_BY] = UNIT_TRIGGERS,
|
2012-07-13 23:34:40 +02:00
|
|
|
[UNIT_PROPAGATES_RELOAD_TO] = UNIT_RELOAD_PROPAGATED_FROM,
|
2012-07-20 15:55:01 +02:00
|
|
|
[UNIT_RELOAD_PROPAGATED_FROM] = UNIT_PROPAGATES_RELOAD_TO,
|
2013-11-27 20:23:18 +01:00
|
|
|
[UNIT_JOINS_NAMESPACE_OF] = UNIT_JOINS_NAMESPACE_OF,
|
2010-01-26 21:39:06 +01:00
|
|
|
};
|
2010-04-21 06:01:13 +02:00
|
|
|
int r, q = 0, v = 0, w = 0;
|
2014-08-08 02:46:49 +02:00
|
|
|
Unit *orig_u = u, *orig_other = other;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(d >= 0 && d < _UNIT_DEPENDENCY_MAX);
|
|
|
|
assert(other);
|
|
|
|
|
2010-09-27 23:24:17 +02:00
|
|
|
u = unit_follow_merge(u);
|
|
|
|
other = unit_follow_merge(other);
|
|
|
|
|
2010-01-26 21:39:06 +01:00
|
|
|
/* We won't allow dependencies on ourselves. We will not
|
|
|
|
* consider them an error however. */
|
2014-08-08 02:46:49 +02:00
|
|
|
if (u == other) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
maybe_warn_about_dependency(orig_u, orig_other->id, d);
|
2010-01-26 21:39:06 +01:00
|
|
|
return 0;
|
2014-08-08 02:46:49 +02:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
r = set_ensure_allocated(&u->dependencies[d], NULL);
|
2013-11-27 20:23:18 +01:00
|
|
|
if (r < 0)
|
2010-01-26 21:39:06 +01:00
|
|
|
return r;
|
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID) {
|
2014-08-13 01:00:18 +02:00
|
|
|
r = set_ensure_allocated(&other->dependencies[inverse_table[d]], NULL);
|
2013-11-27 20:23:18 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (add_reference) {
|
2014-08-13 01:00:18 +02:00
|
|
|
r = set_ensure_allocated(&u->dependencies[UNIT_REFERENCES], NULL);
|
2013-11-27 20:23:18 +01:00
|
|
|
if (r < 0)
|
2010-07-17 00:58:47 +02:00
|
|
|
return r;
|
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
r = set_ensure_allocated(&other->dependencies[UNIT_REFERENCED_BY], NULL);
|
2013-11-27 20:23:18 +01:00
|
|
|
if (r < 0)
|
2010-04-21 06:01:13 +02:00
|
|
|
return r;
|
2013-11-27 20:23:18 +01:00
|
|
|
}
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
q = set_put(u->dependencies[d], other);
|
|
|
|
if (q < 0)
|
2010-04-21 06:01:13 +02:00
|
|
|
return q;
|
2010-01-26 21:39:06 +01:00
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
if (inverse_table[d] != _UNIT_DEPENDENCY_INVALID && inverse_table[d] != d) {
|
|
|
|
v = set_put(other->dependencies[inverse_table[d]], u);
|
|
|
|
if (v < 0) {
|
2010-07-17 00:58:47 +02:00
|
|
|
r = v;
|
|
|
|
goto fail;
|
|
|
|
}
|
2013-11-27 20:23:18 +01:00
|
|
|
}
|
2010-04-21 06:01:13 +02:00
|
|
|
|
|
|
|
if (add_reference) {
|
2013-11-27 20:23:18 +01:00
|
|
|
w = set_put(u->dependencies[UNIT_REFERENCES], other);
|
|
|
|
if (w < 0) {
|
2010-04-21 06:01:13 +02:00
|
|
|
r = w;
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
r = set_put(other->dependencies[UNIT_REFERENCED_BY], u);
|
|
|
|
if (r < 0)
|
2010-04-21 06:01:13 +02:00
|
|
|
goto fail;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
|
|
|
|
2010-02-05 00:38:41 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
2010-01-26 21:39:06 +01:00
|
|
|
return 0;
|
2010-04-21 06:01:13 +02:00
|
|
|
|
|
|
|
fail:
|
|
|
|
if (q > 0)
|
2012-01-15 12:04:08 +01:00
|
|
|
set_remove(u->dependencies[d], other);
|
2010-04-21 06:01:13 +02:00
|
|
|
|
|
|
|
if (v > 0)
|
2012-01-15 12:04:08 +01:00
|
|
|
set_remove(other->dependencies[inverse_table[d]], u);
|
2010-04-21 06:01:13 +02:00
|
|
|
|
|
|
|
if (w > 0)
|
2012-01-15 12:04:08 +01:00
|
|
|
set_remove(u->dependencies[UNIT_REFERENCES], other);
|
2010-04-21 06:01:13 +02:00
|
|
|
|
|
|
|
return r;
|
2010-01-26 21:39:06 +01:00
|
|
|
}
|
2010-01-27 00:15:56 +01:00
|
|
|
|
2010-07-03 19:46:38 +02:00
|
|
|
int unit_add_two_dependencies(Unit *u, UnitDependency d, UnitDependency e, Unit *other, bool add_reference) {
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2014-08-18 22:25:24 +02:00
|
|
|
r = unit_add_dependency(u, d, other, add_reference);
|
|
|
|
if (r < 0)
|
2010-07-03 19:46:38 +02:00
|
|
|
return r;
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
return unit_add_dependency(u, e, other, add_reference);
|
2010-07-03 19:46:38 +02:00
|
|
|
}
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
static int resolve_template(Unit *u, const char *name, const char*path, char **buf, const char **ret) {
|
|
|
|
int r;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name || path);
|
2015-04-30 20:21:00 +02:00
|
|
|
assert(buf);
|
|
|
|
assert(ret);
|
2010-04-15 03:11:11 +02:00
|
|
|
|
|
|
|
if (!name)
|
2013-12-07 03:29:55 +01:00
|
|
|
name = basename(path);
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
if (!unit_name_is_valid(name, UNIT_NAME_TEMPLATE)) {
|
|
|
|
*buf = NULL;
|
|
|
|
*ret = name;
|
|
|
|
return 0;
|
2010-04-15 03:11:11 +02:00
|
|
|
}
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->instance)
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_replace_instance(name, u->instance, buf);
|
2010-04-15 03:11:11 +02:00
|
|
|
else {
|
2013-04-23 04:10:13 +02:00
|
|
|
_cleanup_free_ char *i = NULL;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_to_prefix(u->id, &i);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_replace_instance(name, i, buf);
|
2010-04-15 03:11:11 +02:00
|
|
|
}
|
2015-04-30 20:21:00 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
*ret = *buf;
|
|
|
|
return 0;
|
2010-04-15 03:11:11 +02:00
|
|
|
}
|
|
|
|
|
2010-04-21 06:01:13 +02:00
|
|
|
int unit_add_dependency_by_name(Unit *u, UnitDependency d, const char *name, const char *path, bool add_reference) {
|
2015-04-30 20:21:00 +02:00
|
|
|
_cleanup_free_ char *buf = NULL;
|
2010-01-28 06:43:23 +01:00
|
|
|
Unit *other;
|
|
|
|
int r;
|
|
|
|
|
2010-04-15 03:11:11 +02:00
|
|
|
assert(u);
|
|
|
|
assert(name || path);
|
2010-01-28 06:43:23 +01:00
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = resolve_template(u, name, path, &buf, &name);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-01-28 06:43:23 +01:00
|
|
|
|
2013-01-11 00:21:06 +01:00
|
|
|
r = manager_load_unit(u->manager, name, path, NULL, &other);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-04-15 03:11:11 +02:00
|
|
|
|
2013-01-11 00:21:06 +01:00
|
|
|
return unit_add_dependency(u, d, other, add_reference);
|
2010-01-28 06:43:23 +01:00
|
|
|
}
|
|
|
|
|
2010-07-03 19:46:38 +02:00
|
|
|
int unit_add_two_dependencies_by_name(Unit *u, UnitDependency d, UnitDependency e, const char *name, const char *path, bool add_reference) {
|
2015-04-30 20:21:00 +02:00
|
|
|
_cleanup_free_ char *buf = NULL;
|
2010-07-03 19:46:38 +02:00
|
|
|
Unit *other;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name || path);
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = resolve_template(u, name, path, &buf, &name);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-07-03 19:46:38 +02:00
|
|
|
|
2014-08-18 22:25:24 +02:00
|
|
|
r = manager_load_unit(u->manager, name, path, NULL, &other);
|
|
|
|
if (r < 0)
|
2013-07-25 17:36:01 +02:00
|
|
|
return r;
|
2010-07-03 19:46:38 +02:00
|
|
|
|
2014-08-18 22:25:24 +02:00
|
|
|
return unit_add_two_dependencies(u, d, e, other, add_reference);
|
2010-07-03 19:46:38 +02:00
|
|
|
}
|
|
|
|
|
2010-01-27 00:15:56 +01:00
|
|
|
int set_unit_path(const char *p) {
|
|
|
|
/* This is mostly for debug purposes */
|
2015-10-31 12:14:37 +01:00
|
|
|
if (setenv("SYSTEMD_UNIT_PATH", p, 1) < 0)
|
2013-02-27 18:50:41 +01:00
|
|
|
return -errno;
|
2010-01-27 00:15:56 +01:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2010-01-28 06:44:30 +01:00
|
|
|
|
2010-02-01 03:33:24 +01:00
|
|
|
char *unit_dbus_path(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (!u->id)
|
2010-08-09 17:02:09 +02:00
|
|
|
return NULL;
|
|
|
|
|
2012-06-13 18:22:08 +02:00
|
|
|
return unit_dbus_path_from_name(u->id);
|
2010-02-01 03:33:24 +01:00
|
|
|
}
|
|
|
|
|
2015-08-28 17:36:39 +02:00
|
|
|
int unit_set_slice(Unit *u, Unit *slice) {
|
|
|
|
assert(u);
|
|
|
|
assert(slice);
|
|
|
|
|
|
|
|
/* Sets the unit slice if it has not been set before. Is extra
|
|
|
|
* careful, to only allow this for units that actually have a
|
|
|
|
* cgroup context. Also, we don't allow to set this for slices
|
|
|
|
* (since the parent slice is derived from the name). Make
|
|
|
|
* sure the unit we set is actually a slice. */
|
|
|
|
|
|
|
|
if (!UNIT_HAS_CGROUP_CONTEXT(u))
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
|
|
|
if (u->type == UNIT_SLICE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2015-09-01 18:53:29 +02:00
|
|
|
if (unit_active_state(u) != UNIT_INACTIVE)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2015-08-28 17:36:39 +02:00
|
|
|
if (slice->type != UNIT_SLICE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
if (unit_has_name(u, SPECIAL_INIT_SCOPE) &&
|
|
|
|
!unit_has_name(slice, SPECIAL_ROOT_SLICE))
|
|
|
|
return -EPERM;
|
|
|
|
|
2015-08-28 17:36:39 +02:00
|
|
|
if (UNIT_DEREF(u->slice) == slice)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (UNIT_ISSET(u->slice))
|
|
|
|
return -EBUSY;
|
|
|
|
|
|
|
|
unit_ref_set(&u->slice, slice);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_set_default_slice(Unit *u) {
|
2013-07-11 03:52:43 +02:00
|
|
|
_cleanup_free_ char *b = NULL;
|
|
|
|
const char *slice_name;
|
2013-06-17 21:33:26 +02:00
|
|
|
Unit *slice;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2013-06-20 03:45:08 +02:00
|
|
|
if (UNIT_ISSET(u->slice))
|
2013-06-17 21:33:26 +02:00
|
|
|
return 0;
|
|
|
|
|
2013-07-11 03:52:43 +02:00
|
|
|
if (u->instance) {
|
|
|
|
_cleanup_free_ char *prefix = NULL, *escaped = NULL;
|
2013-07-25 17:36:01 +02:00
|
|
|
|
2013-07-11 03:52:43 +02:00
|
|
|
/* Implicitly place all instantiated units in their
|
|
|
|
* own per-template slice */
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_to_prefix(u->id, &prefix);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2013-07-11 03:52:43 +02:00
|
|
|
|
|
|
|
/* The prefix is already escaped, but it might include
|
|
|
|
* "-" which has a special meaning for slice units,
|
|
|
|
* hence escape it here extra. */
|
2015-04-30 20:21:00 +02:00
|
|
|
escaped = unit_name_escape(prefix);
|
2013-07-11 03:52:43 +02:00
|
|
|
if (!escaped)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2016-02-24 21:24:23 +01:00
|
|
|
if (MANAGER_IS_SYSTEM(u->manager))
|
2013-07-11 03:52:43 +02:00
|
|
|
b = strjoin("system-", escaped, ".slice", NULL);
|
|
|
|
else
|
|
|
|
b = strappend(escaped, ".slice");
|
|
|
|
if (!b)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
slice_name = b;
|
|
|
|
} else
|
|
|
|
slice_name =
|
2016-02-24 21:24:23 +01:00
|
|
|
MANAGER_IS_SYSTEM(u->manager) && !unit_has_name(u, SPECIAL_INIT_SCOPE)
|
2013-07-11 03:52:43 +02:00
|
|
|
? SPECIAL_SYSTEM_SLICE
|
|
|
|
: SPECIAL_ROOT_SLICE;
|
|
|
|
|
|
|
|
r = manager_load_unit(u->manager, slice_name, NULL, NULL, &slice);
|
2013-06-17 21:33:26 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2015-08-28 17:36:39 +02:00
|
|
|
return unit_set_slice(u, slice);
|
2013-06-17 21:33:26 +02:00
|
|
|
}
|
|
|
|
|
2013-06-20 03:45:08 +02:00
|
|
|
const char *unit_slice_name(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (!UNIT_ISSET(u->slice))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return UNIT_DEREF(u->slice)->id;
|
|
|
|
}
|
|
|
|
|
2010-04-10 04:48:33 +02:00
|
|
|
int unit_load_related_unit(Unit *u, const char *type, Unit **_found) {
|
2013-04-25 00:01:29 +02:00
|
|
|
_cleanup_free_ char *t = NULL;
|
2010-04-10 04:48:33 +02:00
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(type);
|
|
|
|
assert(_found);
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_change_suffix(u->id, type, &t);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
if (unit_has_name(u, t))
|
|
|
|
return -EINVAL;
|
2010-04-10 04:48:33 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
r = manager_load_unit(u->manager, t, NULL, NULL, _found);
|
2010-04-15 03:11:11 +02:00
|
|
|
assert(r < 0 || *_found != u);
|
2010-04-10 04:48:33 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2015-08-05 17:47:45 +02:00
|
|
|
static int signal_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error) {
|
|
|
|
const char *name, *old_owner, *new_owner;
|
|
|
|
Unit *u = userdata;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(message);
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
r = sd_bus_message_read(message, "sss", &name, &old_owner, &new_owner);
|
|
|
|
if (r < 0) {
|
|
|
|
bus_log_parse_error(r);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->bus_name_owner_change)
|
|
|
|
UNIT_VTABLE(u)->bus_name_owner_change(u, name, old_owner, new_owner);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-10-17 16:25:10 +02:00
|
|
|
int unit_install_bus_match(Unit *u, sd_bus *bus, const char *name) {
|
|
|
|
const char *match;
|
2015-08-05 17:47:45 +02:00
|
|
|
|
2015-10-17 16:25:10 +02:00
|
|
|
assert(u);
|
|
|
|
assert(bus);
|
|
|
|
assert(name);
|
2015-08-05 17:47:45 +02:00
|
|
|
|
|
|
|
if (u->match_bus_slot)
|
|
|
|
return -EBUSY;
|
|
|
|
|
2015-10-17 16:25:10 +02:00
|
|
|
match = strjoina("type='signal',"
|
2016-04-09 20:04:09 +02:00
|
|
|
"sender='org.freedesktop.DBus',"
|
|
|
|
"path='/org/freedesktop/DBus',"
|
|
|
|
"interface='org.freedesktop.DBus',"
|
|
|
|
"member='NameOwnerChanged',"
|
|
|
|
"arg0='", name, "'");
|
2015-08-05 17:47:45 +02:00
|
|
|
|
|
|
|
return sd_bus_add_match(bus, &u->match_bus_slot, match, signal_name_owner_changed, u);
|
|
|
|
}
|
|
|
|
|
2010-04-15 23:16:16 +02:00
|
|
|
int unit_watch_bus_name(Unit *u, const char *name) {
|
2015-08-05 17:47:45 +02:00
|
|
|
int r;
|
|
|
|
|
2010-04-15 23:16:16 +02:00
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
|
|
|
|
/* Watch a specific name on the bus. We only support one unit
|
|
|
|
* watching each name for now. */
|
|
|
|
|
2015-08-05 17:47:45 +02:00
|
|
|
if (u->manager->api_bus) {
|
|
|
|
/* If the bus is already available, install the match directly.
|
|
|
|
* Otherwise, just put the name in the list. bus_setup_api() will take care later. */
|
2015-10-17 16:25:10 +02:00
|
|
|
r = unit_install_bus_match(u, u->manager->api_bus, name);
|
2015-08-05 17:47:45 +02:00
|
|
|
if (r < 0)
|
2015-10-15 17:39:14 +02:00
|
|
|
return log_warning_errno(r, "Failed to subscribe to NameOwnerChanged signal for '%s': %m", name);
|
2015-08-05 17:47:45 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
r = hashmap_put(u->manager->watch_bus, name, u);
|
|
|
|
if (r < 0) {
|
|
|
|
u->match_bus_slot = sd_bus_slot_unref(u->match_bus_slot);
|
|
|
|
return log_warning_errno(r, "Failed to put bus name to hashmap: %m");
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2010-04-15 23:16:16 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void unit_unwatch_bus_name(Unit *u, const char *name) {
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
hashmap_remove_value(u->manager->watch_bus, name, u);
|
2015-08-05 17:47:45 +02:00
|
|
|
u->match_bus_slot = sd_bus_slot_unref(u->match_bus_slot);
|
2010-04-15 23:16:16 +02:00
|
|
|
}
|
|
|
|
|
2010-04-21 03:27:44 +02:00
|
|
|
bool unit_can_serialize(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
return UNIT_VTABLE(u)->serialize && UNIT_VTABLE(u)->deserialize_item;
|
|
|
|
}
|
|
|
|
|
2012-07-18 01:46:52 +02:00
|
|
|
int unit_serialize(Unit *u, FILE *f, FDSet *fds, bool serialize_jobs) {
|
2010-04-21 03:27:44 +02:00
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(f);
|
|
|
|
assert(fds);
|
|
|
|
|
2014-05-16 01:15:03 +02:00
|
|
|
if (unit_can_serialize(u)) {
|
|
|
|
ExecRuntime *rt;
|
2010-04-21 03:27:44 +02:00
|
|
|
|
2014-05-16 01:15:03 +02:00
|
|
|
r = UNIT_VTABLE(u)->serialize(u, f, fds);
|
2013-11-27 20:23:18 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2014-05-16 01:15:03 +02:00
|
|
|
|
|
|
|
rt = unit_get_exec_runtime(u);
|
|
|
|
if (rt) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
r = exec_runtime_serialize(u, rt, f, fds);
|
2014-05-16 01:15:03 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
core: add NOP jobs, job type collapsing
Two of our current job types are special:
JOB_TRY_RESTART, JOB_RELOAD_OR_START.
They differ from other job types by being sensitive to the unit active state.
They perform some action when the unit is active and some other action
otherwise. This raises a question: when exactly should the unit state be
checked to make the decision?
Currently the unit state is checked when the job becomes runnable. It's more
sensible to check the state immediately when the job is added by the user.
When the user types "systemctl try-restart foo.service", he really intends
to restart the service if it's running right now. If it isn't running right
now, the restart is pointless.
Consider the example (from Bugzilla[1]):
sleep.service takes some time to start.
hello.service has After=sleep.service.
Both services get started. Two jobs will appear:
hello.service/start waiting
sleep.service/start running
Then someone runs "systemctl try-restart hello.service".
Currently the try-restart operation will block and wait for
sleep.service/start to complete.
The correct result is to complete the try-restart operation immediately
with success, because hello.service is not running. The two original
jobs must not be disturbed by this.
To fix this we introduce two new concepts:
- a new job type: JOB_NOP
A JOB_NOP job does not do anything to the unit. It does not pull in any
dependencies. It is always immediately runnable. When installed to a unit,
it sits in a special slot (u->nop_job) where it never conflicts with
the installed job (u->job) of a different type. It never merges with jobs
of other types, but it can merge into an already installed JOB_NOP job.
- "collapsing" of job types
When a job of one of the two special types is added, the state of the unit
is checked immediately and the job type changes:
JOB_TRY_RESTART -> JOB_RESTART or JOB_NOP
JOB_RELOAD_OR_START -> JOB_RELOAD or JOB_START
Should a job type JOB_RELOAD_OR_START appear later during job merging, it
collapses immediately afterwards.
Collapsing actually makes some things simpler, because there are now fewer
job types that are allowed in the transaction.
[1] Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=753586
2012-04-25 11:58:27 +02:00
|
|
|
}
|
|
|
|
|
2016-02-01 16:01:25 +01:00
|
|
|
dual_timestamp_serialize(f, "state-change-timestamp", &u->state_change_timestamp);
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_serialize(f, "inactive-exit-timestamp", &u->inactive_exit_timestamp);
|
|
|
|
dual_timestamp_serialize(f, "active-enter-timestamp", &u->active_enter_timestamp);
|
|
|
|
dual_timestamp_serialize(f, "active-exit-timestamp", &u->active_exit_timestamp);
|
|
|
|
dual_timestamp_serialize(f, "inactive-enter-timestamp", &u->inactive_enter_timestamp);
|
2016-02-01 16:01:25 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_serialize(f, "condition-timestamp", &u->condition_timestamp);
|
2014-11-06 13:43:45 +01:00
|
|
|
dual_timestamp_serialize(f, "assert-timestamp", &u->assert_timestamp);
|
2011-03-17 04:36:19 +01:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (dual_timestamp_is_set(&u->condition_timestamp))
|
|
|
|
unit_serialize_item(u, f, "condition-result", yes_no(u->condition_result));
|
2010-10-27 00:01:12 +02:00
|
|
|
|
2014-11-06 13:43:45 +01:00
|
|
|
if (dual_timestamp_is_set(&u->assert_timestamp))
|
|
|
|
unit_serialize_item(u, f, "assert-result", yes_no(u->assert_result));
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
unit_serialize_item(u, f, "transient", yes_no(u->transient));
|
2015-03-01 16:24:19 +01:00
|
|
|
unit_serialize_item_format(u, f, "cpuacct-usage-base", "%" PRIu64, u->cpuacct_usage_base);
|
2013-06-28 04:12:58 +02:00
|
|
|
|
|
|
|
if (u->cgroup_path)
|
|
|
|
unit_serialize_item(u, f, "cgroup", u->cgroup_path);
|
2015-06-10 14:36:50 +02:00
|
|
|
unit_serialize_item(u, f, "cgroup-realized", yes_no(u->cgroup_realized));
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
if (serialize_jobs) {
|
|
|
|
if (u->job) {
|
|
|
|
fprintf(f, "job\n");
|
|
|
|
job_serialize(u->job, f, fds);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (u->nop_job) {
|
|
|
|
fprintf(f, "job\n");
|
|
|
|
job_serialize(u->nop_job, f, fds);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-04-21 03:27:44 +02:00
|
|
|
/* End marker */
|
|
|
|
fputc('\n', f);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2015-10-07 23:07:39 +02:00
|
|
|
int unit_serialize_item(Unit *u, FILE *f, const char *key, const char *value) {
|
|
|
|
assert(u);
|
|
|
|
assert(f);
|
|
|
|
assert(key);
|
|
|
|
|
|
|
|
if (!value)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
fputs(key, f);
|
|
|
|
fputc('=', f);
|
|
|
|
fputs(value, f);
|
|
|
|
fputc('\n', f);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_serialize_item_escaped(Unit *u, FILE *f, const char *key, const char *value) {
|
|
|
|
_cleanup_free_ char *c = NULL;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(f);
|
|
|
|
assert(key);
|
|
|
|
|
|
|
|
if (!value)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
c = cescape(value);
|
|
|
|
if (!c)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
fputs(key, f);
|
|
|
|
fputc('=', f);
|
|
|
|
fputs(c, f);
|
|
|
|
fputc('\n', f);
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_serialize_item_fd(Unit *u, FILE *f, FDSet *fds, const char *key, int fd) {
|
|
|
|
int copy;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(f);
|
|
|
|
assert(key);
|
|
|
|
|
|
|
|
if (fd < 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
copy = fdset_put_dup(fds, fd);
|
|
|
|
if (copy < 0)
|
|
|
|
return copy;
|
|
|
|
|
|
|
|
fprintf(f, "%s=%i\n", key, copy);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2010-04-21 03:27:44 +02:00
|
|
|
void unit_serialize_item_format(Unit *u, FILE *f, const char *key, const char *format, ...) {
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(f);
|
|
|
|
assert(key);
|
|
|
|
assert(format);
|
|
|
|
|
|
|
|
fputs(key, f);
|
|
|
|
fputc('=', f);
|
|
|
|
|
|
|
|
va_start(ap, format);
|
|
|
|
vfprintf(f, format, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
fputc('\n', f);
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_deserialize(Unit *u, FILE *f, FDSet *fds) {
|
2013-11-28 01:24:56 +01:00
|
|
|
ExecRuntime **rt = NULL;
|
2014-05-16 01:15:03 +02:00
|
|
|
size_t offset;
|
2010-04-21 03:27:44 +02:00
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(f);
|
|
|
|
assert(fds);
|
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
offset = UNIT_VTABLE(u)->exec_runtime_offset;
|
|
|
|
if (offset > 0)
|
|
|
|
rt = (ExecRuntime**) ((uint8_t*) u + offset);
|
|
|
|
|
2010-04-21 03:27:44 +02:00
|
|
|
for (;;) {
|
2011-04-07 18:48:50 +02:00
|
|
|
char line[LINE_MAX], *l, *v;
|
2010-04-21 03:27:44 +02:00
|
|
|
size_t k;
|
|
|
|
|
|
|
|
if (!fgets(line, sizeof(line), f)) {
|
|
|
|
if (feof(f))
|
|
|
|
return 0;
|
|
|
|
return -errno;
|
|
|
|
}
|
|
|
|
|
2010-08-11 20:19:27 +02:00
|
|
|
char_array_0(line);
|
2010-04-21 03:27:44 +02:00
|
|
|
l = strstrip(line);
|
|
|
|
|
|
|
|
/* End marker */
|
2015-04-21 20:22:51 +02:00
|
|
|
if (isempty(l))
|
2016-02-01 16:01:25 +01:00
|
|
|
break;
|
2010-04-21 03:27:44 +02:00
|
|
|
|
|
|
|
k = strcspn(l, "=");
|
|
|
|
|
|
|
|
if (l[k] == '=') {
|
|
|
|
l[k] = 0;
|
|
|
|
v = l+k+1;
|
|
|
|
} else
|
|
|
|
v = l+k;
|
|
|
|
|
2010-06-03 14:26:50 +02:00
|
|
|
if (streq(l, "job")) {
|
2012-04-23 01:24:04 +02:00
|
|
|
if (v[0] == '\0') {
|
|
|
|
/* new-style serialized job */
|
2015-01-05 17:22:10 +01:00
|
|
|
Job *j;
|
|
|
|
|
|
|
|
j = job_new_raw(u);
|
2012-04-23 01:24:04 +02:00
|
|
|
if (!j)
|
2015-04-21 20:22:51 +02:00
|
|
|
return log_oom();
|
2012-04-23 01:24:04 +02:00
|
|
|
|
|
|
|
r = job_deserialize(j, f, fds);
|
|
|
|
if (r < 0) {
|
|
|
|
job_free(j);
|
|
|
|
return r;
|
|
|
|
}
|
2010-06-03 14:26:50 +02:00
|
|
|
|
2012-04-23 01:24:04 +02:00
|
|
|
r = hashmap_put(u->manager->jobs, UINT32_TO_PTR(j->id), j);
|
|
|
|
if (r < 0) {
|
|
|
|
job_free(j);
|
|
|
|
return r;
|
|
|
|
}
|
core: add NOP jobs, job type collapsing
Two of our current job types are special:
JOB_TRY_RESTART, JOB_RELOAD_OR_START.
They differ from other job types by being sensitive to the unit active state.
They perform some action when the unit is active and some other action
otherwise. This raises a question: when exactly should the unit state be
checked to make the decision?
Currently the unit state is checked when the job becomes runnable. It's more
sensible to check the state immediately when the job is added by the user.
When the user types "systemctl try-restart foo.service", he really intends
to restart the service if it's running right now. If it isn't running right
now, the restart is pointless.
Consider the example (from Bugzilla[1]):
sleep.service takes some time to start.
hello.service has After=sleep.service.
Both services get started. Two jobs will appear:
hello.service/start waiting
sleep.service/start running
Then someone runs "systemctl try-restart hello.service".
Currently the try-restart operation will block and wait for
sleep.service/start to complete.
The correct result is to complete the try-restart operation immediately
with success, because hello.service is not running. The two original
jobs must not be disturbed by this.
To fix this we introduce two new concepts:
- a new job type: JOB_NOP
A JOB_NOP job does not do anything to the unit. It does not pull in any
dependencies. It is always immediately runnable. When installed to a unit,
it sits in a special slot (u->nop_job) where it never conflicts with
the installed job (u->job) of a different type. It never merges with jobs
of other types, but it can merge into an already installed JOB_NOP job.
- "collapsing" of job types
When a job of one of the two special types is added, the state of the unit
is checked immediately and the job type changes:
JOB_TRY_RESTART -> JOB_RESTART or JOB_NOP
JOB_RELOAD_OR_START -> JOB_RELOAD or JOB_START
Should a job type JOB_RELOAD_OR_START appear later during job merging, it
collapses immediately afterwards.
Collapsing actually makes some things simpler, because there are now fewer
job types that are allowed in the transaction.
[1] Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=753586
2012-04-25 11:58:27 +02:00
|
|
|
|
|
|
|
r = job_install_deserialized(j);
|
|
|
|
if (r < 0) {
|
|
|
|
hashmap_remove(u->manager->jobs, UINT32_TO_PTR(j->id));
|
|
|
|
job_free(j);
|
|
|
|
return r;
|
|
|
|
}
|
2015-05-19 16:41:14 +02:00
|
|
|
} else /* legacy for pre-44 */
|
|
|
|
log_unit_warning(u, "Update from too old systemd versions are unsupported, cannot deserialize job: %s", v);
|
2010-06-03 14:26:50 +02:00
|
|
|
continue;
|
2016-02-01 16:01:25 +01:00
|
|
|
} else if (streq(l, "state-change-timestamp")) {
|
|
|
|
dual_timestamp_deserialize(v, &u->state_change_timestamp);
|
|
|
|
continue;
|
2010-10-28 02:19:21 +02:00
|
|
|
} else if (streq(l, "inactive-exit-timestamp")) {
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_deserialize(v, &u->inactive_exit_timestamp);
|
2010-10-28 02:19:21 +02:00
|
|
|
continue;
|
|
|
|
} else if (streq(l, "active-enter-timestamp")) {
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_deserialize(v, &u->active_enter_timestamp);
|
2010-10-28 02:19:21 +02:00
|
|
|
continue;
|
|
|
|
} else if (streq(l, "active-exit-timestamp")) {
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_deserialize(v, &u->active_exit_timestamp);
|
2010-10-28 02:19:21 +02:00
|
|
|
continue;
|
|
|
|
} else if (streq(l, "inactive-enter-timestamp")) {
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_deserialize(v, &u->inactive_enter_timestamp);
|
2010-10-28 02:19:21 +02:00
|
|
|
continue;
|
2011-03-17 04:36:19 +01:00
|
|
|
} else if (streq(l, "condition-timestamp")) {
|
2012-01-15 12:04:08 +01:00
|
|
|
dual_timestamp_deserialize(v, &u->condition_timestamp);
|
2011-03-17 04:36:19 +01:00
|
|
|
continue;
|
2014-11-06 13:43:45 +01:00
|
|
|
} else if (streq(l, "assert-timestamp")) {
|
|
|
|
dual_timestamp_deserialize(v, &u->assert_timestamp);
|
|
|
|
continue;
|
2011-03-17 04:36:19 +01:00
|
|
|
} else if (streq(l, "condition-result")) {
|
|
|
|
|
2015-04-21 20:22:51 +02:00
|
|
|
r = parse_boolean(v);
|
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Failed to parse condition result value %s, ignoring.", v);
|
2011-03-17 04:36:19 +01:00
|
|
|
else
|
2015-04-21 20:22:51 +02:00
|
|
|
u->condition_result = r;
|
2011-03-29 23:32:31 +02:00
|
|
|
|
|
|
|
continue;
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2014-11-06 13:43:45 +01:00
|
|
|
} else if (streq(l, "assert-result")) {
|
|
|
|
|
2015-04-21 20:22:51 +02:00
|
|
|
r = parse_boolean(v);
|
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Failed to parse assert result value %s, ignoring.", v);
|
2014-11-06 13:43:45 +01:00
|
|
|
else
|
2015-04-21 20:22:51 +02:00
|
|
|
u->assert_result = r;
|
2014-11-06 13:43:45 +01:00
|
|
|
|
|
|
|
continue;
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
} else if (streq(l, "transient")) {
|
|
|
|
|
2015-04-21 20:22:51 +02:00
|
|
|
r = parse_boolean(v);
|
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Failed to parse transient bool %s, ignoring.", v);
|
2013-06-28 04:12:58 +02:00
|
|
|
else
|
2015-04-21 20:22:51 +02:00
|
|
|
u->transient = r;
|
2013-06-28 04:12:58 +02:00
|
|
|
|
|
|
|
continue;
|
2015-04-21 20:22:51 +02:00
|
|
|
|
2015-03-01 16:24:19 +01:00
|
|
|
} else if (streq(l, "cpuacct-usage-base")) {
|
|
|
|
|
|
|
|
r = safe_atou64(v, &u->cpuacct_usage_base);
|
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug(u, "Failed to parse CPU usage %s, ignoring.", v);
|
2015-03-01 16:24:19 +01:00
|
|
|
|
2015-04-16 14:10:33 +02:00
|
|
|
continue;
|
2014-04-18 04:12:25 +02:00
|
|
|
|
2015-04-21 20:22:51 +02:00
|
|
|
} else if (streq(l, "cgroup")) {
|
2013-07-10 21:17:37 +02:00
|
|
|
|
2015-04-21 20:22:51 +02:00
|
|
|
r = unit_set_cgroup_path(u, v);
|
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_debug_errno(u, r, "Failed to set cgroup path %s, ignoring: %m", v);
|
2014-04-18 04:12:25 +02:00
|
|
|
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
(void) unit_watch_cgroup(u);
|
|
|
|
|
2015-06-10 14:36:50 +02:00
|
|
|
continue;
|
|
|
|
} else if (streq(l, "cgroup-realized")) {
|
|
|
|
int b;
|
|
|
|
|
|
|
|
b = parse_boolean(v);
|
|
|
|
if (b < 0)
|
|
|
|
log_unit_debug(u, "Failed to parse cgroup-realized bool %s, ignoring.", v);
|
|
|
|
else
|
|
|
|
u->cgroup_realized = b;
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
continue;
|
2010-10-28 02:19:21 +02:00
|
|
|
}
|
2010-06-03 14:26:50 +02:00
|
|
|
|
2014-05-16 01:15:03 +02:00
|
|
|
if (unit_can_serialize(u)) {
|
|
|
|
if (rt) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
r = exec_runtime_deserialize_item(u, rt, l, v, fds);
|
2015-04-21 20:22:51 +02:00
|
|
|
if (r < 0) {
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_warning(u, "Failed to deserialize runtime parameter '%s', ignoring.", l);
|
2015-04-21 20:22:51 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Returns positive if key was handled by the call */
|
2014-05-16 01:15:03 +02:00
|
|
|
if (r > 0)
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = UNIT_VTABLE(u)->deserialize_item(u, l, v, fds);
|
2013-11-27 20:23:18 +01:00
|
|
|
if (r < 0)
|
core,network: major per-object logging rework
This changes log_unit_info() (and friends) to take a real Unit* object
insted of just a unit name as parameter. The call will now prefix all
logged messages with the unit name, thus allowing the unit name to be
dropped from the various passed romat strings, simplifying invocations
drastically, and unifying log output across messages. Also, UNIT= vs.
USER_UNIT= is now derived from the Manager object attached to the Unit
object, instead of getpid(). This has the benefit of correcting the
field for --test runs.
Also contains a couple of other logging improvements:
- Drops a couple of strerror() invocations in favour of using %m.
- Not only .mount units now warn if a symlinks exist for the mount
point already, .automount units do that too, now.
- A few invocations of log_struct() that didn't actually pass any
additional structured data have been replaced by simpler invocations
of log_unit_info() and friends.
- For structured data a new LOG_UNIT_MESSAGE() macro has been added,
that works like LOG_MESSAGE() but prefixes the message with the unit
name. Similar, there's now LOG_LINK_MESSAGE() and
LOG_NETDEV_MESSAGE().
- For structured data new LOG_UNIT_ID(), LOG_LINK_INTERFACE(),
LOG_NETDEV_INTERFACE() macros have been added that generate the
necessary per object fields. The old log_unit_struct() call has been
removed in favour of these new macros used in raw log_struct()
invocations. In addition to removing one more function call this
allows generated structured log messages that contain two object
fields, as necessary for example for network interfaces that are
joined into another network interface, and whose messages shall be
indexed by both.
- The LOG_ERRNO() macro has been removed, in favour of
log_struct_errno(). The latter has the benefit of ensuring that %m in
format strings is properly resolved to the specified error number.
- A number of logging messages have been converted to use
log_unit_info() instead of log_info()
- The client code in sysv-generator no longer #includes core code from
src/core/.
- log_unit_full_errno() has been removed, log_unit_full() instead takes
an errno now, too.
- log_unit_info(), log_link_info(), log_netdev_info() and friends, now
avoid double evaluation of their parameters
2015-05-11 20:38:21 +02:00
|
|
|
log_unit_warning(u, "Failed to deserialize unit parameter '%s', ignoring.", l);
|
2013-11-27 20:23:18 +01:00
|
|
|
}
|
2010-04-21 03:27:44 +02:00
|
|
|
}
|
2016-02-01 16:01:25 +01:00
|
|
|
|
|
|
|
/* Versions before 228 did not carry a state change timestamp. In this case, take the current time. This is
|
|
|
|
* useful, so that timeouts based on this timestamp don't trigger too early, and is in-line with the logic from
|
2016-01-13 14:52:51 +01:00
|
|
|
* before 228 where the base for timeouts was not persistent across reboots. */
|
2016-02-01 16:01:25 +01:00
|
|
|
|
|
|
|
if (!dual_timestamp_is_set(&u->state_change_timestamp))
|
|
|
|
dual_timestamp_get(&u->state_change_timestamp);
|
|
|
|
|
|
|
|
return 0;
|
2010-04-21 03:27:44 +02:00
|
|
|
}
|
|
|
|
|
core: Do not bind a mount unit to a device, if it was from mountinfo
If a mount unit is bound to a device, systemd tries to umount the
mount point, if it thinks the device has gone away.
Due to the uevent queue and inotify of /proc/self/mountinfo being two
different sources, systemd can never get the ordering reliably correct.
It can happen, that in the uevent queue ADD,REMOVE,ADD is queued
and an inotify of mountinfo (or libmount event) happend with the
device in question.
systemd cannot know, at which point of time the mount happend in the
ADD,REMOVE,ADD sequence.
The real ordering might have been ADD,REMOVE,ADD,mount
and systemd might think ADD,mount,REMOVE,ADD and would umount the
mountpoint.
A test script which triggered this behaviour is:
rm -f test-efi-disk.img
dd if=/dev/null of=test-efi-disk.img bs=1M seek=512 count=1
parted --script test-efi-disk.img \
"mklabel gpt" \
"mkpart ESP fat32 1MiB 511MiB" \
"set 1 boot on"
LOOP=$(losetup --show -f -P test-efi-disk.img)
udevadm settle
mkfs.vfat -F32 ${LOOP}p1
mkdir -p mnt
mount ${LOOP}p1 mnt
... <dostuffwith mnt>
Without the "udevadm settle" systemd unmounted mnt while the script was
operating on mnt.
Of course the question is, why there was a REMOVE in the first place,
but this is not part of this patch.
2015-11-24 09:41:26 +01:00
|
|
|
int unit_add_node_link(Unit *u, const char *what, bool wants, UnitDependency dep) {
|
2010-05-13 03:07:16 +02:00
|
|
|
Unit *device;
|
2013-07-25 17:36:01 +02:00
|
|
|
_cleanup_free_ char *e = NULL;
|
2010-05-13 03:07:16 +02:00
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
/* Adds in links to the device node that this unit is based on */
|
2015-04-24 17:28:06 +02:00
|
|
|
if (isempty(what))
|
|
|
|
return 0;
|
2010-05-13 03:07:16 +02:00
|
|
|
|
2010-05-16 18:13:58 +02:00
|
|
|
if (!is_device_path(what))
|
2010-05-13 03:07:16 +02:00
|
|
|
return 0;
|
|
|
|
|
2015-04-24 17:28:06 +02:00
|
|
|
/* When device units aren't supported (such as in a
|
|
|
|
* container), don't create dependencies on them. */
|
2015-04-30 01:29:00 +02:00
|
|
|
if (!unit_type_supported(UNIT_DEVICE))
|
2015-04-24 17:28:06 +02:00
|
|
|
return 0;
|
|
|
|
|
2015-04-30 20:21:00 +02:00
|
|
|
r = unit_name_from_path(what, ".device", &e);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2010-05-13 03:07:16 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
r = manager_load_unit(u->manager, e, NULL, NULL, &device);
|
2010-05-13 03:07:16 +02:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
core: Do not bind a mount unit to a device, if it was from mountinfo
If a mount unit is bound to a device, systemd tries to umount the
mount point, if it thinks the device has gone away.
Due to the uevent queue and inotify of /proc/self/mountinfo being two
different sources, systemd can never get the ordering reliably correct.
It can happen, that in the uevent queue ADD,REMOVE,ADD is queued
and an inotify of mountinfo (or libmount event) happend with the
device in question.
systemd cannot know, at which point of time the mount happend in the
ADD,REMOVE,ADD sequence.
The real ordering might have been ADD,REMOVE,ADD,mount
and systemd might think ADD,mount,REMOVE,ADD and would umount the
mountpoint.
A test script which triggered this behaviour is:
rm -f test-efi-disk.img
dd if=/dev/null of=test-efi-disk.img bs=1M seek=512 count=1
parted --script test-efi-disk.img \
"mklabel gpt" \
"mkpart ESP fat32 1MiB 511MiB" \
"set 1 boot on"
LOOP=$(losetup --show -f -P test-efi-disk.img)
udevadm settle
mkfs.vfat -F32 ${LOOP}p1
mkdir -p mnt
mount ${LOOP}p1 mnt
... <dostuffwith mnt>
Without the "udevadm settle" systemd unmounted mnt while the script was
operating on mnt.
Of course the question is, why there was a REMOVE in the first place,
but this is not part of this patch.
2015-11-24 09:41:26 +01:00
|
|
|
r = unit_add_two_dependencies(u, UNIT_AFTER,
|
2016-02-24 21:24:23 +01:00
|
|
|
MANAGER_IS_SYSTEM(u->manager) ? dep : UNIT_WANTS,
|
core: Do not bind a mount unit to a device, if it was from mountinfo
If a mount unit is bound to a device, systemd tries to umount the
mount point, if it thinks the device has gone away.
Due to the uevent queue and inotify of /proc/self/mountinfo being two
different sources, systemd can never get the ordering reliably correct.
It can happen, that in the uevent queue ADD,REMOVE,ADD is queued
and an inotify of mountinfo (or libmount event) happend with the
device in question.
systemd cannot know, at which point of time the mount happend in the
ADD,REMOVE,ADD sequence.
The real ordering might have been ADD,REMOVE,ADD,mount
and systemd might think ADD,mount,REMOVE,ADD and would umount the
mountpoint.
A test script which triggered this behaviour is:
rm -f test-efi-disk.img
dd if=/dev/null of=test-efi-disk.img bs=1M seek=512 count=1
parted --script test-efi-disk.img \
"mklabel gpt" \
"mkpart ESP fat32 1MiB 511MiB" \
"set 1 boot on"
LOOP=$(losetup --show -f -P test-efi-disk.img)
udevadm settle
mkfs.vfat -F32 ${LOOP}p1
mkdir -p mnt
mount ${LOOP}p1 mnt
... <dostuffwith mnt>
Without the "udevadm settle" systemd unmounted mnt while the script was
operating on mnt.
Of course the question is, why there was a REMOVE in the first place,
but this is not part of this patch.
2015-11-24 09:41:26 +01:00
|
|
|
device, true);
|
2012-09-17 21:58:03 +02:00
|
|
|
if (r < 0)
|
2010-05-13 03:07:16 +02:00
|
|
|
return r;
|
|
|
|
|
2012-09-17 21:58:03 +02:00
|
|
|
if (wants) {
|
|
|
|
r = unit_add_dependency(device, UNIT_WANTS, u, false);
|
|
|
|
if (r < 0)
|
2010-05-13 03:07:16 +02:00
|
|
|
return r;
|
2012-09-17 21:58:03 +02:00
|
|
|
}
|
2010-05-13 03:07:16 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2010-04-21 03:27:44 +02:00
|
|
|
|
2015-04-24 15:27:19 +02:00
|
|
|
int unit_coldplug(Unit *u) {
|
2015-11-10 20:38:30 +01:00
|
|
|
int r = 0, q = 0;
|
2010-06-03 14:26:50 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2015-04-24 16:04:50 +02:00
|
|
|
/* Make sure we don't enter a loop, when coldplugging
|
|
|
|
* recursively. */
|
|
|
|
if (u->coldplugged)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
u->coldplugged = true;
|
|
|
|
|
2015-11-10 20:38:30 +01:00
|
|
|
if (UNIT_VTABLE(u)->coldplug)
|
2015-04-24 16:04:50 +02:00
|
|
|
r = UNIT_VTABLE(u)->coldplug(u);
|
2010-06-03 14:26:50 +02:00
|
|
|
|
2015-11-10 20:38:30 +01:00
|
|
|
if (u->job)
|
|
|
|
q = job_coldplug(u->job);
|
|
|
|
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
if (q < 0)
|
|
|
|
return q;
|
2010-06-03 14:26:50 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-04-12 11:10:57 +02:00
|
|
|
static bool fragment_mtime_changed(const char *path, usec_t mtime) {
|
|
|
|
struct stat st;
|
|
|
|
|
|
|
|
if (!path)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (stat(path, &st) < 0)
|
|
|
|
/* What, cannot access this anymore? */
|
|
|
|
return true;
|
|
|
|
|
|
|
|
if (mtime > 0)
|
|
|
|
/* For non-empty files check the mtime */
|
|
|
|
return timespec_load(&st.st_mtim) != mtime;
|
|
|
|
else if (!null_or_empty(&st))
|
|
|
|
/* For masked files check if they are still so */
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2010-07-17 00:57:51 +02:00
|
|
|
bool unit_need_daemon_reload(Unit *u) {
|
2013-04-01 12:32:35 +02:00
|
|
|
_cleanup_strv_free_ char **t = NULL;
|
|
|
|
char **path;
|
|
|
|
unsigned loaded_cnt, current_cnt;
|
2012-05-22 23:08:24 +02:00
|
|
|
|
2010-07-17 00:57:51 +02:00
|
|
|
assert(u);
|
|
|
|
|
2016-04-12 11:10:57 +02:00
|
|
|
if (fragment_mtime_changed(u->fragment_path, u->fragment_mtime) ||
|
|
|
|
fragment_mtime_changed(u->source_path, u->source_mtime))
|
|
|
|
return true;
|
2011-06-15 15:34:19 +02:00
|
|
|
|
2014-12-15 05:12:40 +01:00
|
|
|
(void) unit_find_dropin_paths(u, &t);
|
2013-04-01 12:32:35 +02:00
|
|
|
loaded_cnt = strv_length(t);
|
|
|
|
current_cnt = strv_length(u->dropin_paths);
|
|
|
|
|
|
|
|
if (loaded_cnt == current_cnt) {
|
|
|
|
if (loaded_cnt == 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (strv_overlap(u->dropin_paths, t)) {
|
2016-04-12 11:10:57 +02:00
|
|
|
STRV_FOREACH(path, u->dropin_paths)
|
|
|
|
if (fragment_mtime_changed(*path, u->dropin_mtime))
|
2013-04-01 12:32:35 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
2016-04-12 11:10:57 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
2010-07-17 00:57:51 +02:00
|
|
|
}
|
|
|
|
|
2010-08-31 00:23:34 +02:00
|
|
|
void unit_reset_failed(Unit *u) {
|
2010-07-18 04:58:01 +02:00
|
|
|
assert(u);
|
|
|
|
|
2010-08-31 00:23:34 +02:00
|
|
|
if (UNIT_VTABLE(u)->reset_failed)
|
|
|
|
UNIT_VTABLE(u)->reset_failed(u);
|
core: make the StartLimitXYZ= settings generic and apply to any kind of unit, not just services
This moves the StartLimitBurst=, StartLimitInterval=, StartLimitAction=, RebootArgument= from the [Service] section
into the [Unit] section of unit files, and thus support it in all unit types, not just in services.
This way we can enforce the start limit much earlier, in particular before testing the unit conditions, so that
repeated start-up failure due to failed conditions is also considered for the start limit logic.
For compatibility the four options may also be configured in the [Service] section still, but we only document them in
their new section [Unit].
This also renamed the socket unit failure code "service-failed-permanent" into "service-start-limit-hit" to express
more clearly what it is about, after all it's only triggered through the start limit being hit.
Finally, the code in busname_trigger_notify() and socket_trigger_notify() is altered to become more alike.
Fixes: #2467
2016-02-09 18:38:03 +01:00
|
|
|
|
|
|
|
RATELIMIT_RESET(u->start_limit);
|
|
|
|
u->start_limit_hit = false;
|
2010-07-18 04:58:01 +02:00
|
|
|
}
|
|
|
|
|
2010-07-21 05:00:29 +02:00
|
|
|
Unit *unit_following(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->following)
|
|
|
|
return UNIT_VTABLE(u)->following(u);
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-04-26 02:57:41 +02:00
|
|
|
bool unit_stop_pending(Unit *u) {
|
2010-09-01 03:35:04 +02:00
|
|
|
assert(u);
|
|
|
|
|
2013-04-26 02:57:41 +02:00
|
|
|
/* This call does check the current state of the unit. It's
|
|
|
|
* hence useful to be called from state change calls of the
|
|
|
|
* unit itself, where the state isn't updated yet. This is
|
|
|
|
* different from unit_inactive_or_pending() which checks both
|
|
|
|
* the current state and for a queued job. */
|
2010-09-01 03:35:04 +02:00
|
|
|
|
2013-04-26 02:57:41 +02:00
|
|
|
return u->job && u->job->type == JOB_STOP;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool unit_inactive_or_pending(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
/* Returns true if the unit is inactive or going down */
|
2010-09-01 03:35:04 +02:00
|
|
|
|
2013-05-06 22:28:39 +02:00
|
|
|
if (UNIT_IS_INACTIVE_OR_DEACTIVATING(unit_active_state(u)))
|
|
|
|
return true;
|
|
|
|
|
2013-04-26 02:57:41 +02:00
|
|
|
if (unit_stop_pending(u))
|
2010-09-01 03:35:04 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-04-26 02:57:41 +02:00
|
|
|
bool unit_active_or_pending(Unit *u) {
|
2010-10-05 19:49:15 +02:00
|
|
|
assert(u);
|
|
|
|
|
2011-12-09 15:24:04 +01:00
|
|
|
/* Returns true if the unit is active or going up */
|
2010-10-05 19:49:15 +02:00
|
|
|
|
|
|
|
if (UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u)))
|
|
|
|
return true;
|
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
if (u->job &&
|
|
|
|
(u->job->type == JOB_START ||
|
|
|
|
u->job->type == JOB_RELOAD_OR_START ||
|
|
|
|
u->job->type == JOB_RESTART))
|
2010-10-05 19:49:15 +02:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-11-19 21:12:59 +01:00
|
|
|
int unit_kill(Unit *u, KillWho w, int signo, sd_bus_error *error) {
|
2010-10-22 16:11:50 +02:00
|
|
|
assert(u);
|
|
|
|
assert(w >= 0 && w < _KILL_WHO_MAX);
|
2016-04-08 11:27:28 +02:00
|
|
|
assert(SIGNAL_VALID(signo));
|
2010-10-22 16:11:50 +02:00
|
|
|
|
|
|
|
if (!UNIT_VTABLE(u)->kill)
|
2015-03-13 14:08:00 +01:00
|
|
|
return -EOPNOTSUPP;
|
2010-10-22 16:11:50 +02:00
|
|
|
|
2012-07-20 00:00:04 +02:00
|
|
|
return UNIT_VTABLE(u)->kill(u, w, signo, error);
|
2010-10-22 16:11:50 +02:00
|
|
|
}
|
|
|
|
|
2013-07-30 01:54:59 +02:00
|
|
|
static Set *unit_pid_set(pid_t main_pid, pid_t control_pid) {
|
|
|
|
Set *pid_set;
|
|
|
|
int r;
|
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
pid_set = set_new(NULL);
|
2013-07-30 01:54:59 +02:00
|
|
|
if (!pid_set)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
/* Exclude the main/control pids from being killed via the cgroup */
|
|
|
|
if (main_pid > 0) {
|
2015-09-03 13:22:51 +02:00
|
|
|
r = set_put(pid_set, PID_TO_PTR(main_pid));
|
2013-07-30 01:54:59 +02:00
|
|
|
if (r < 0)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (control_pid > 0) {
|
2015-09-03 13:22:51 +02:00
|
|
|
r = set_put(pid_set, PID_TO_PTR(control_pid));
|
2013-07-30 01:54:59 +02:00
|
|
|
if (r < 0)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
return pid_set;
|
|
|
|
|
|
|
|
fail:
|
|
|
|
set_free(pid_set);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-03-22 23:25:54 +01:00
|
|
|
int unit_kill_common(
|
|
|
|
Unit *u,
|
|
|
|
KillWho who,
|
|
|
|
int signo,
|
|
|
|
pid_t main_pid,
|
|
|
|
pid_t control_pid,
|
2013-11-19 21:12:59 +01:00
|
|
|
sd_bus_error *error) {
|
2013-03-22 23:25:54 +01:00
|
|
|
|
2013-03-02 22:31:09 +01:00
|
|
|
int r = 0;
|
2015-09-18 11:56:53 +02:00
|
|
|
bool killed = false;
|
2013-03-02 22:31:09 +01:00
|
|
|
|
2015-09-18 11:56:53 +02:00
|
|
|
if (IN_SET(who, KILL_MAIN, KILL_MAIN_FAIL)) {
|
2013-03-02 22:31:09 +01:00
|
|
|
if (main_pid < 0)
|
2014-10-31 01:32:17 +01:00
|
|
|
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_PROCESS, "%s units have no main processes", unit_type_to_string(u->type));
|
2015-08-28 18:29:02 +02:00
|
|
|
else if (main_pid == 0)
|
2014-10-31 01:32:17 +01:00
|
|
|
return sd_bus_error_set_const(error, BUS_ERROR_NO_SUCH_PROCESS, "No main process to kill");
|
2013-03-02 22:31:09 +01:00
|
|
|
}
|
|
|
|
|
2015-09-18 11:56:53 +02:00
|
|
|
if (IN_SET(who, KILL_CONTROL, KILL_CONTROL_FAIL)) {
|
2013-03-02 22:31:09 +01:00
|
|
|
if (control_pid < 0)
|
2014-10-31 01:32:17 +01:00
|
|
|
return sd_bus_error_setf(error, BUS_ERROR_NO_SUCH_PROCESS, "%s units have no control processes", unit_type_to_string(u->type));
|
2015-08-28 18:29:02 +02:00
|
|
|
else if (control_pid == 0)
|
2014-10-31 01:32:17 +01:00
|
|
|
return sd_bus_error_set_const(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
|
2013-03-02 22:31:09 +01:00
|
|
|
}
|
|
|
|
|
2015-09-18 11:56:53 +02:00
|
|
|
if (IN_SET(who, KILL_CONTROL, KILL_CONTROL_FAIL, KILL_ALL, KILL_ALL_FAIL))
|
|
|
|
if (control_pid > 0) {
|
2013-03-02 22:31:09 +01:00
|
|
|
if (kill(control_pid, signo) < 0)
|
|
|
|
r = -errno;
|
2015-09-18 11:56:53 +02:00
|
|
|
else
|
|
|
|
killed = true;
|
|
|
|
}
|
2013-03-02 22:31:09 +01:00
|
|
|
|
2015-09-18 11:56:53 +02:00
|
|
|
if (IN_SET(who, KILL_MAIN, KILL_MAIN_FAIL, KILL_ALL, KILL_ALL_FAIL))
|
|
|
|
if (main_pid > 0) {
|
2013-03-02 22:31:09 +01:00
|
|
|
if (kill(main_pid, signo) < 0)
|
|
|
|
r = -errno;
|
2015-09-18 11:56:53 +02:00
|
|
|
else
|
|
|
|
killed = true;
|
|
|
|
}
|
2013-03-02 22:31:09 +01:00
|
|
|
|
2015-09-18 11:56:53 +02:00
|
|
|
if (IN_SET(who, KILL_ALL, KILL_ALL_FAIL) && u->cgroup_path) {
|
2013-03-02 22:31:09 +01:00
|
|
|
_cleanup_set_free_ Set *pid_set = NULL;
|
|
|
|
int q;
|
|
|
|
|
2013-07-30 01:54:59 +02:00
|
|
|
/* Exclude the main/control pids from being killed via the cgroup */
|
|
|
|
pid_set = unit_pid_set(main_pid, control_pid);
|
2013-03-02 22:31:09 +01:00
|
|
|
if (!pid_set)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2015-09-01 18:54:08 +02:00
|
|
|
q = cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, signo, false, false, false, pid_set);
|
2013-03-02 22:31:09 +01:00
|
|
|
if (q < 0 && q != -EAGAIN && q != -ESRCH && q != -ENOENT)
|
|
|
|
r = q;
|
2015-09-18 11:56:53 +02:00
|
|
|
else
|
|
|
|
killed = true;
|
2013-03-02 22:31:09 +01:00
|
|
|
}
|
|
|
|
|
2016-01-10 18:10:08 +01:00
|
|
|
if (r == 0 && !killed && IN_SET(who, KILL_ALL_FAIL, KILL_CONTROL_FAIL))
|
2015-09-18 11:56:53 +02:00
|
|
|
return -ESRCH;
|
|
|
|
|
2013-03-02 22:31:09 +01:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-11-14 23:47:53 +01:00
|
|
|
int unit_following_set(Unit *u, Set **s) {
|
|
|
|
assert(u);
|
|
|
|
assert(s);
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->following_set)
|
|
|
|
return UNIT_VTABLE(u)->following_set(u, s);
|
|
|
|
|
|
|
|
*s = NULL;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-07-31 18:28:02 +02:00
|
|
|
UnitFileState unit_get_unit_file_state(Unit *u) {
|
install: follow unit file symlinks in /usr, but not /etc when looking for [Install] data
Some distributions use alias unit files via symlinks in /usr to cover
for legacy service names. With this change we'll allow "systemctl
enable" on such aliases.
Previously, our rule was that symlinks are user configuration that
"systemctl enable" + "systemctl disable" creates and removes, while unit
files is where the instructions to do so are store. As a result of the
rule we'd never read install information through symlinks, since that
would mix enablement state with installation instructions.
Now, the new rule is that only symlinks inside of /etc are
configuration. Unit files, and symlinks in /usr are now valid for
installation instructions.
This patch is quite a rework of the whole install logic, and makes the
following addional changes:
- Adds a complete test "test-instal-root" that tests the install logic
pretty comprehensively.
- Never uses canonicalize_file_name(), because that's incompatible with
operation relative to a specific root directory.
- unit_file_get_state() is reworked to return a proper error, and
returns the state in a call-by-ref parameter. This cleans up confusion
between the enum type and errno-like errors.
- The new logic puts a limit on how long to follow unit file symlinks:
it will do so only for 64 steps at max.
- The InstallContext object's fields are renamed to will_process and
has_processed (will_install and has_installed) since they are also
used for deinstallation and all kinds of other operations.
- The root directory is always verified before use.
- install.c is reordered to place the exported functions together.
- Stricter rules are followed when traversing symlinks: the unit suffix
must say identical, and it's not allowed to link between regular units
and templated units.
- Various modernizations
- The "invalid" unit file state has been renamed to "bad", in order to
avoid confusion between UNIT_FILE_INVALID and
_UNIT_FILE_STATE_INVALID. Given that the state should normally not be
seen and is not documented this should not be a problematic change.
The new name is now documented however.
Fixes #1375, #1718, #1706
2015-10-08 22:31:56 +02:00
|
|
|
int r;
|
|
|
|
|
2011-07-31 18:28:02 +02:00
|
|
|
assert(u);
|
|
|
|
|
install: follow unit file symlinks in /usr, but not /etc when looking for [Install] data
Some distributions use alias unit files via symlinks in /usr to cover
for legacy service names. With this change we'll allow "systemctl
enable" on such aliases.
Previously, our rule was that symlinks are user configuration that
"systemctl enable" + "systemctl disable" creates and removes, while unit
files is where the instructions to do so are store. As a result of the
rule we'd never read install information through symlinks, since that
would mix enablement state with installation instructions.
Now, the new rule is that only symlinks inside of /etc are
configuration. Unit files, and symlinks in /usr are now valid for
installation instructions.
This patch is quite a rework of the whole install logic, and makes the
following addional changes:
- Adds a complete test "test-instal-root" that tests the install logic
pretty comprehensively.
- Never uses canonicalize_file_name(), because that's incompatible with
operation relative to a specific root directory.
- unit_file_get_state() is reworked to return a proper error, and
returns the state in a call-by-ref parameter. This cleans up confusion
between the enum type and errno-like errors.
- The new logic puts a limit on how long to follow unit file symlinks:
it will do so only for 64 steps at max.
- The InstallContext object's fields are renamed to will_process and
has_processed (will_install and has_installed) since they are also
used for deinstallation and all kinds of other operations.
- The root directory is always verified before use.
- install.c is reordered to place the exported functions together.
- Stricter rules are followed when traversing symlinks: the unit suffix
must say identical, and it's not allowed to link between regular units
and templated units.
- Various modernizations
- The "invalid" unit file state has been renamed to "bad", in order to
avoid confusion between UNIT_FILE_INVALID and
_UNIT_FILE_STATE_INVALID. Given that the state should normally not be
seen and is not documented this should not be a problematic change.
The new name is now documented however.
Fixes #1375, #1718, #1706
2015-10-08 22:31:56 +02:00
|
|
|
if (u->unit_file_state < 0 && u->fragment_path) {
|
|
|
|
r = unit_file_get_state(
|
2016-02-24 21:24:23 +01:00
|
|
|
u->manager->unit_file_scope,
|
install: follow unit file symlinks in /usr, but not /etc when looking for [Install] data
Some distributions use alias unit files via symlinks in /usr to cover
for legacy service names. With this change we'll allow "systemctl
enable" on such aliases.
Previously, our rule was that symlinks are user configuration that
"systemctl enable" + "systemctl disable" creates and removes, while unit
files is where the instructions to do so are store. As a result of the
rule we'd never read install information through symlinks, since that
would mix enablement state with installation instructions.
Now, the new rule is that only symlinks inside of /etc are
configuration. Unit files, and symlinks in /usr are now valid for
installation instructions.
This patch is quite a rework of the whole install logic, and makes the
following addional changes:
- Adds a complete test "test-instal-root" that tests the install logic
pretty comprehensively.
- Never uses canonicalize_file_name(), because that's incompatible with
operation relative to a specific root directory.
- unit_file_get_state() is reworked to return a proper error, and
returns the state in a call-by-ref parameter. This cleans up confusion
between the enum type and errno-like errors.
- The new logic puts a limit on how long to follow unit file symlinks:
it will do so only for 64 steps at max.
- The InstallContext object's fields are renamed to will_process and
has_processed (will_install and has_installed) since they are also
used for deinstallation and all kinds of other operations.
- The root directory is always verified before use.
- install.c is reordered to place the exported functions together.
- Stricter rules are followed when traversing symlinks: the unit suffix
must say identical, and it's not allowed to link between regular units
and templated units.
- Various modernizations
- The "invalid" unit file state has been renamed to "bad", in order to
avoid confusion between UNIT_FILE_INVALID and
_UNIT_FILE_STATE_INVALID. Given that the state should normally not be
seen and is not documented this should not be a problematic change.
The new name is now documented however.
Fixes #1375, #1718, #1706
2015-10-08 22:31:56 +02:00
|
|
|
NULL,
|
|
|
|
basename(u->fragment_path),
|
|
|
|
&u->unit_file_state);
|
|
|
|
if (r < 0)
|
|
|
|
u->unit_file_state = UNIT_FILE_BAD;
|
|
|
|
}
|
2011-07-31 18:28:02 +02:00
|
|
|
|
2012-01-15 12:04:08 +01:00
|
|
|
return u->unit_file_state;
|
2011-07-31 18:28:02 +02:00
|
|
|
}
|
|
|
|
|
2014-12-02 02:38:18 +01:00
|
|
|
int unit_get_unit_file_preset(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (u->unit_file_preset < 0 && u->fragment_path)
|
|
|
|
u->unit_file_preset = unit_file_query_preset(
|
2016-02-24 21:24:23 +01:00
|
|
|
u->manager->unit_file_scope,
|
install: follow unit file symlinks in /usr, but not /etc when looking for [Install] data
Some distributions use alias unit files via symlinks in /usr to cover
for legacy service names. With this change we'll allow "systemctl
enable" on such aliases.
Previously, our rule was that symlinks are user configuration that
"systemctl enable" + "systemctl disable" creates and removes, while unit
files is where the instructions to do so are store. As a result of the
rule we'd never read install information through symlinks, since that
would mix enablement state with installation instructions.
Now, the new rule is that only symlinks inside of /etc are
configuration. Unit files, and symlinks in /usr are now valid for
installation instructions.
This patch is quite a rework of the whole install logic, and makes the
following addional changes:
- Adds a complete test "test-instal-root" that tests the install logic
pretty comprehensively.
- Never uses canonicalize_file_name(), because that's incompatible with
operation relative to a specific root directory.
- unit_file_get_state() is reworked to return a proper error, and
returns the state in a call-by-ref parameter. This cleans up confusion
between the enum type and errno-like errors.
- The new logic puts a limit on how long to follow unit file symlinks:
it will do so only for 64 steps at max.
- The InstallContext object's fields are renamed to will_process and
has_processed (will_install and has_installed) since they are also
used for deinstallation and all kinds of other operations.
- The root directory is always verified before use.
- install.c is reordered to place the exported functions together.
- Stricter rules are followed when traversing symlinks: the unit suffix
must say identical, and it's not allowed to link between regular units
and templated units.
- Various modernizations
- The "invalid" unit file state has been renamed to "bad", in order to
avoid confusion between UNIT_FILE_INVALID and
_UNIT_FILE_STATE_INVALID. Given that the state should normally not be
seen and is not documented this should not be a problematic change.
The new name is now documented however.
Fixes #1375, #1718, #1706
2015-10-08 22:31:56 +02:00
|
|
|
NULL,
|
|
|
|
basename(u->fragment_path));
|
2014-12-02 02:38:18 +01:00
|
|
|
|
|
|
|
return u->unit_file_preset;
|
|
|
|
}
|
|
|
|
|
2012-01-06 23:08:54 +01:00
|
|
|
Unit* unit_ref_set(UnitRef *ref, Unit *u) {
|
|
|
|
assert(ref);
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (ref->unit)
|
|
|
|
unit_ref_unset(ref);
|
|
|
|
|
|
|
|
ref->unit = u;
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_PREPEND(refs, u->refs, ref);
|
2012-01-06 23:08:54 +01:00
|
|
|
return u;
|
|
|
|
}
|
|
|
|
|
|
|
|
void unit_ref_unset(UnitRef *ref) {
|
|
|
|
assert(ref);
|
|
|
|
|
|
|
|
if (!ref->unit)
|
|
|
|
return;
|
|
|
|
|
2016-04-29 11:18:53 +02:00
|
|
|
/* We are about to drop a reference to the unit, make sure the garbage collection has a look at it as it might
|
|
|
|
* be unreferenced now. */
|
|
|
|
unit_add_to_gc_queue(ref->unit);
|
|
|
|
|
2013-10-14 06:10:14 +02:00
|
|
|
LIST_REMOVE(refs, ref->unit->refs, ref);
|
2012-01-06 23:08:54 +01:00
|
|
|
ref->unit = NULL;
|
|
|
|
}
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
int unit_patch_contexts(Unit *u) {
|
|
|
|
CGroupContext *cc;
|
|
|
|
ExecContext *ec;
|
2012-07-20 00:09:35 +02:00
|
|
|
unsigned i;
|
|
|
|
int r;
|
|
|
|
|
2012-07-16 12:44:42 +02:00
|
|
|
assert(u);
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
/* Patch in the manager defaults into the exec and cgroup
|
|
|
|
* contexts, _after_ the rest of the settings have been
|
|
|
|
* initialized */
|
2014-02-24 23:50:10 +01:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
ec = unit_get_exec_context(u);
|
|
|
|
if (ec) {
|
|
|
|
/* This only copies in the ones that need memory */
|
|
|
|
for (i = 0; i < _RLIMIT_MAX; i++)
|
|
|
|
if (u->manager->rlimit[i] && !ec->rlimit[i]) {
|
|
|
|
ec->rlimit[i] = newdup(struct rlimit, u->manager->rlimit[i], 1);
|
|
|
|
if (!ec->rlimit[i])
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2016-02-24 21:24:23 +01:00
|
|
|
if (MANAGER_IS_USER(u->manager) &&
|
2014-03-19 20:40:05 +01:00
|
|
|
!ec->working_directory) {
|
|
|
|
|
|
|
|
r = get_home_dir(&ec->working_directory);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2015-02-12 12:21:16 +01:00
|
|
|
|
|
|
|
/* Allow user services to run, even if the
|
|
|
|
* home directory is missing */
|
|
|
|
ec->working_directory_missing_ok = true;
|
2012-07-20 00:09:35 +02:00
|
|
|
}
|
|
|
|
|
2016-02-24 21:24:23 +01:00
|
|
|
if (MANAGER_IS_USER(u->manager) &&
|
2014-03-19 20:40:05 +01:00
|
|
|
(ec->syscall_whitelist ||
|
|
|
|
!set_isempty(ec->syscall_filter) ||
|
|
|
|
!set_isempty(ec->syscall_archs) ||
|
|
|
|
ec->address_families_whitelist ||
|
|
|
|
!set_isempty(ec->address_families)))
|
|
|
|
ec->no_new_privileges = true;
|
2012-07-16 12:44:42 +02:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (ec->private_devices)
|
2016-01-07 23:00:04 +01:00
|
|
|
ec->capability_bounding_set &= ~(UINT64_C(1) << CAP_MKNOD);
|
2012-07-20 00:09:35 +02:00
|
|
|
}
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
cc = unit_get_cgroup_context(u);
|
|
|
|
if (cc) {
|
2014-02-26 02:28:52 +01:00
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (ec &&
|
|
|
|
ec->private_devices &&
|
|
|
|
cc->device_policy == CGROUP_AUTO)
|
|
|
|
cc->device_policy = CGROUP_CLOSED;
|
|
|
|
}
|
2014-03-18 17:58:19 +01:00
|
|
|
|
2012-07-20 00:09:35 +02:00
|
|
|
return 0;
|
2012-07-16 12:44:42 +02:00
|
|
|
}
|
|
|
|
|
2012-09-18 11:40:01 +02:00
|
|
|
ExecContext *unit_get_exec_context(Unit *u) {
|
|
|
|
size_t offset;
|
|
|
|
assert(u);
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (u->type < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2012-09-18 11:40:01 +02:00
|
|
|
offset = UNIT_VTABLE(u)->exec_context_offset;
|
|
|
|
if (offset <= 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return (ExecContext*) ((uint8_t*) u + offset);
|
|
|
|
}
|
|
|
|
|
2013-11-19 21:12:59 +01:00
|
|
|
KillContext *unit_get_kill_context(Unit *u) {
|
|
|
|
size_t offset;
|
|
|
|
assert(u);
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (u->type < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-11-19 21:12:59 +01:00
|
|
|
offset = UNIT_VTABLE(u)->kill_context_offset;
|
|
|
|
if (offset <= 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return (KillContext*) ((uint8_t*) u + offset);
|
|
|
|
}
|
|
|
|
|
2013-06-27 04:14:27 +02:00
|
|
|
CGroupContext *unit_get_cgroup_context(Unit *u) {
|
|
|
|
size_t offset;
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (u->type < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-06-27 04:14:27 +02:00
|
|
|
offset = UNIT_VTABLE(u)->cgroup_context_offset;
|
|
|
|
if (offset <= 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return (CGroupContext*) ((uint8_t*) u + offset);
|
|
|
|
}
|
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
ExecRuntime *unit_get_exec_runtime(Unit *u) {
|
|
|
|
size_t offset;
|
|
|
|
|
2014-03-19 20:40:05 +01:00
|
|
|
if (u->type < 0)
|
|
|
|
return NULL;
|
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
offset = UNIT_VTABLE(u)->exec_runtime_offset;
|
|
|
|
if (offset <= 0)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return *(ExecRuntime**) ((uint8_t*) u + offset);
|
|
|
|
}
|
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
static const char* unit_drop_in_dir(Unit *u, UnitSetPropertiesMode mode) {
|
2015-08-28 16:05:32 +02:00
|
|
|
assert(u);
|
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
if (!IN_SET(mode, UNIT_RUNTIME, UNIT_PERSISTENT))
|
|
|
|
return NULL;
|
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
if (u->transient) /* Redirect drop-ins for transient units always into the transient directory. */
|
|
|
|
return u->manager->lookup_paths.transient;
|
2013-02-27 18:50:41 +01:00
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
if (mode == UNIT_RUNTIME)
|
2016-04-07 15:43:59 +02:00
|
|
|
return u->manager->lookup_paths.runtime_control;
|
2015-08-28 16:05:32 +02:00
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
if (mode == UNIT_PERSISTENT)
|
2016-04-07 15:43:59 +02:00
|
|
|
return u->manager->lookup_paths.persistent_control;
|
2013-02-27 18:50:41 +01:00
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
return NULL;
|
2013-01-19 01:01:41 +01:00
|
|
|
}
|
|
|
|
|
2013-06-27 21:14:56 +02:00
|
|
|
int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *data) {
|
2016-02-25 01:13:57 +01:00
|
|
|
_cleanup_free_ char *p = NULL, *q = NULL;
|
2016-04-08 18:10:32 +02:00
|
|
|
const char *dir, *prefixed;
|
2013-02-27 18:50:41 +01:00
|
|
|
int r;
|
2013-01-19 01:01:41 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
if (u->transient_file) {
|
|
|
|
/* When this is a transient unit file in creation, then let's not create a new drop-in but instead
|
|
|
|
* write to the transient unit file. */
|
|
|
|
fputs(data, u->transient_file);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-02-17 01:58:33 +01:00
|
|
|
if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME))
|
2013-06-27 21:14:56 +02:00
|
|
|
return 0;
|
|
|
|
|
2016-02-25 01:13:57 +01:00
|
|
|
dir = unit_drop_in_dir(u, mode);
|
|
|
|
if (!dir)
|
|
|
|
return -EINVAL;
|
2013-01-19 01:01:41 +01:00
|
|
|
|
2016-04-08 18:10:32 +02:00
|
|
|
prefixed = strjoina("# This is a drop-in unit file extension, created via \"systemctl set-property\" or an equivalent operation. Do not edit.\n",
|
|
|
|
data);
|
|
|
|
|
2016-04-08 18:13:02 +02:00
|
|
|
r = drop_in_file(dir, u->id, 50, name, &p, &q);
|
2014-12-09 13:46:30 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2016-04-08 18:13:02 +02:00
|
|
|
(void) mkdir_p(p, 0755);
|
|
|
|
r = write_string_file_atomic_label(q, prefixed);
|
2014-12-09 13:46:30 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
|
2016-04-08 18:13:02 +02:00
|
|
|
r = strv_push(&u->dropin_paths, q);
|
2014-12-09 13:46:30 +01:00
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2016-04-08 18:13:02 +02:00
|
|
|
q = NULL;
|
2014-12-09 13:46:30 +01:00
|
|
|
|
|
|
|
strv_uniq(u->dropin_paths);
|
|
|
|
|
|
|
|
u->dropin_mtime = now(CLOCK_REALTIME);
|
|
|
|
|
|
|
|
return 0;
|
2013-02-27 18:50:41 +01:00
|
|
|
}
|
2013-01-19 01:01:41 +01:00
|
|
|
|
2013-07-11 21:29:33 +02:00
|
|
|
int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) {
|
|
|
|
_cleanup_free_ char *p = NULL;
|
|
|
|
va_list ap;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
assert(format);
|
|
|
|
|
2014-02-17 01:58:33 +01:00
|
|
|
if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME))
|
2013-07-11 21:29:33 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
va_start(ap, format);
|
|
|
|
r = vasprintf(&p, format, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
if (r < 0)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return unit_write_drop_in(u, mode, name, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *data) {
|
2016-02-25 01:13:57 +01:00
|
|
|
const char *ndata;
|
2013-06-27 21:50:35 +02:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
assert(data);
|
|
|
|
|
|
|
|
if (!UNIT_VTABLE(u)->private_section)
|
|
|
|
return -EINVAL;
|
|
|
|
|
2014-02-17 01:58:33 +01:00
|
|
|
if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME))
|
2013-07-11 21:29:33 +02:00
|
|
|
return 0;
|
|
|
|
|
2016-04-09 20:04:09 +02:00
|
|
|
ndata = strjoina("[", UNIT_VTABLE(u)->private_section, "]\n", data);
|
2013-06-27 21:50:35 +02:00
|
|
|
|
|
|
|
return unit_write_drop_in(u, mode, name, ndata);
|
|
|
|
}
|
|
|
|
|
2013-07-11 21:29:33 +02:00
|
|
|
int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, const char *name, const char *format, ...) {
|
|
|
|
_cleanup_free_ char *p = NULL;
|
|
|
|
va_list ap;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(name);
|
|
|
|
assert(format);
|
|
|
|
|
2014-02-17 01:58:33 +01:00
|
|
|
if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME))
|
2013-07-11 21:29:33 +02:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
va_start(ap, format);
|
|
|
|
r = vasprintf(&p, format, ap);
|
|
|
|
va_end(ap);
|
|
|
|
|
|
|
|
if (r < 0)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
return unit_write_drop_in_private(u, mode, name, p);
|
|
|
|
}
|
2013-01-19 01:01:41 +01:00
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
int unit_make_transient(Unit *u) {
|
2016-04-07 15:43:59 +02:00
|
|
|
FILE *f;
|
|
|
|
char *path;
|
|
|
|
|
2013-06-28 04:12:58 +02:00
|
|
|
assert(u);
|
|
|
|
|
2015-08-28 16:05:32 +02:00
|
|
|
if (!UNIT_VTABLE(u)->can_transient)
|
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
path = strjoin(u->manager->lookup_paths.transient, "/", u->id, NULL);
|
|
|
|
if (!path)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
/* Let's open the file we'll write the transient settings into. This file is kept open as long as we are
|
|
|
|
* creating the transient, and is closed in unit_load(), as soon as we start loading the file. */
|
|
|
|
|
2016-04-09 04:20:22 +02:00
|
|
|
RUN_WITH_UMASK(0022) {
|
2016-04-07 15:43:59 +02:00
|
|
|
f = fopen(path, "we");
|
2016-04-09 04:20:22 +02:00
|
|
|
if (!f) {
|
|
|
|
free(path);
|
|
|
|
return -errno;
|
|
|
|
}
|
2016-04-07 15:43:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (u->transient_file)
|
|
|
|
fclose(u->transient_file);
|
|
|
|
u->transient_file = f;
|
|
|
|
|
|
|
|
free(u->fragment_path);
|
|
|
|
u->fragment_path = path;
|
2015-11-17 14:09:16 +01:00
|
|
|
|
|
|
|
u->source_path = mfree(u->source_path);
|
|
|
|
u->dropin_paths = strv_free(u->dropin_paths);
|
|
|
|
u->fragment_mtime = u->source_mtime = u->dropin_mtime = 0;
|
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
u->load_state = UNIT_STUB;
|
|
|
|
u->load_error = 0;
|
|
|
|
u->transient = true;
|
|
|
|
|
2015-11-17 14:09:16 +01:00
|
|
|
unit_add_to_dbus_queue(u);
|
|
|
|
unit_add_to_gc_queue(u);
|
|
|
|
unit_add_to_load_queue(u);
|
2013-06-28 04:12:58 +02:00
|
|
|
|
2016-04-07 15:43:59 +02:00
|
|
|
fputs("# This is a transient unit file, created programmatically via the systemd API. Do not edit.\n",
|
|
|
|
u->transient_file);
|
|
|
|
|
2015-08-28 16:05:32 +02:00
|
|
|
return 0;
|
2013-06-28 04:12:58 +02:00
|
|
|
}
|
|
|
|
|
2013-01-26 05:53:30 +01:00
|
|
|
int unit_kill_context(
|
|
|
|
Unit *u,
|
|
|
|
KillContext *c,
|
2014-10-28 16:35:40 +01:00
|
|
|
KillOperation k,
|
2013-01-26 05:53:30 +01:00
|
|
|
pid_t main_pid,
|
|
|
|
pid_t control_pid,
|
|
|
|
bool main_pid_alien) {
|
|
|
|
|
2015-09-01 18:51:44 +02:00
|
|
|
bool wait_for_exit = false;
|
|
|
|
int sig, r;
|
2013-01-26 05:53:30 +01:00
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(c);
|
|
|
|
|
|
|
|
if (c->kill_mode == KILL_NONE)
|
|
|
|
return 0;
|
|
|
|
|
2014-10-28 16:35:40 +01:00
|
|
|
switch (k) {
|
|
|
|
case KILL_KILL:
|
|
|
|
sig = SIGKILL;
|
|
|
|
break;
|
|
|
|
case KILL_ABORT:
|
|
|
|
sig = SIGABRT;
|
|
|
|
break;
|
|
|
|
case KILL_TERMINATE:
|
|
|
|
sig = c->kill_signal;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert_not_reached("KillOperation unknown");
|
|
|
|
}
|
2013-01-26 05:53:30 +01:00
|
|
|
|
|
|
|
if (main_pid > 0) {
|
|
|
|
r = kill_and_sigcont(main_pid, sig);
|
|
|
|
|
|
|
|
if (r < 0 && r != -ESRCH) {
|
|
|
|
_cleanup_free_ char *comm = NULL;
|
|
|
|
get_process_comm(main_pid, &comm);
|
|
|
|
|
2015-09-01 18:51:44 +02:00
|
|
|
log_unit_warning_errno(u, r, "Failed to kill main process " PID_FMT " (%s), ignoring: %m", main_pid, strna(comm));
|
2013-07-30 01:54:59 +02:00
|
|
|
} else {
|
2014-01-29 20:12:18 +01:00
|
|
|
if (!main_pid_alien)
|
|
|
|
wait_for_exit = true;
|
2013-07-30 01:54:59 +02:00
|
|
|
|
2015-09-01 18:54:08 +02:00
|
|
|
if (c->send_sighup && k == KILL_TERMINATE)
|
|
|
|
(void) kill(main_pid, SIGHUP);
|
2013-07-30 01:54:59 +02:00
|
|
|
}
|
2013-01-26 05:53:30 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (control_pid > 0) {
|
|
|
|
r = kill_and_sigcont(control_pid, sig);
|
|
|
|
|
|
|
|
if (r < 0 && r != -ESRCH) {
|
|
|
|
_cleanup_free_ char *comm = NULL;
|
|
|
|
get_process_comm(control_pid, &comm);
|
|
|
|
|
2015-09-01 18:51:44 +02:00
|
|
|
log_unit_warning_errno(u, r, "Failed to kill control process " PID_FMT " (%s), ignoring: %m", control_pid, strna(comm));
|
2013-07-30 01:54:59 +02:00
|
|
|
} else {
|
2013-01-26 05:53:30 +01:00
|
|
|
wait_for_exit = true;
|
2013-07-30 01:54:59 +02:00
|
|
|
|
2015-09-01 18:54:08 +02:00
|
|
|
if (c->send_sighup && k == KILL_TERMINATE)
|
|
|
|
(void) kill(control_pid, SIGHUP);
|
2013-07-30 01:54:59 +02:00
|
|
|
}
|
2013-01-26 05:53:30 +01:00
|
|
|
}
|
|
|
|
|
2015-09-01 18:51:44 +02:00
|
|
|
if (u->cgroup_path &&
|
|
|
|
(c->kill_mode == KILL_CONTROL_GROUP || (c->kill_mode == KILL_MIXED && k == KILL_KILL))) {
|
2013-01-26 05:53:30 +01:00
|
|
|
_cleanup_set_free_ Set *pid_set = NULL;
|
|
|
|
|
2013-07-30 01:54:59 +02:00
|
|
|
/* Exclude the main/control pids from being killed via the cgroup */
|
|
|
|
pid_set = unit_pid_set(main_pid, control_pid);
|
2013-01-26 05:53:30 +01:00
|
|
|
if (!pid_set)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2015-09-01 18:54:08 +02:00
|
|
|
r = cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, sig, true, k != KILL_TERMINATE, false, pid_set);
|
2013-01-26 05:53:30 +01:00
|
|
|
if (r < 0) {
|
|
|
|
if (r != -EAGAIN && r != -ESRCH && r != -ENOENT)
|
2015-09-01 18:51:44 +02:00
|
|
|
log_unit_warning_errno(u, r, "Failed to kill control group %s, ignoring: %m", u->cgroup_path);
|
|
|
|
|
2013-07-30 01:54:59 +02:00
|
|
|
} else if (r > 0) {
|
2014-01-29 20:12:18 +01:00
|
|
|
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
/* FIXME: For now, on the legacy hierarchy, we
|
|
|
|
* will not wait for the cgroup members to die
|
|
|
|
* if we are running in a container or if this
|
|
|
|
* is a delegation unit, simply because cgroup
|
|
|
|
* notification is unreliable in these
|
|
|
|
* cases. It doesn't work at all in
|
|
|
|
* containers, and outside of containers it
|
|
|
|
* can be confused easily by left-over
|
2016-04-22 04:57:06 +02:00
|
|
|
* directories in the cgroup — which however
|
core: unified cgroup hierarchy support
This patch set adds full support the new unified cgroup hierarchy logic
of modern kernels.
A new kernel command line option "systemd.unified_cgroup_hierarchy=1" is
added. If specified the unified hierarchy is mounted to /sys/fs/cgroup
instead of a tmpfs. No further hierarchies are mounted. The kernel
command line option defaults to off. We can turn it on by default as
soon as the kernel's APIs regarding this are stabilized (but even then
downstream distros might want to turn this off, as this will break any
tools that access cgroupfs directly).
It is possibly to choose for each boot individually whether the unified
or the legacy hierarchy is used. nspawn will by default provide the
legacy hierarchy to containers if the host is using it, and the unified
otherwise. However it is possible to run containers with the unified
hierarchy on a legacy host and vice versa, by setting the
$UNIFIED_CGROUP_HIERARCHY environment variable for nspawn to 1 or 0,
respectively.
The unified hierarchy provides reliable cgroup empty notifications for
the first time, via inotify. To make use of this we maintain one
manager-wide inotify fd, and each cgroup to it.
This patch also removes cg_delete() which is unused now.
On kernel 4.2 only the "memory" controller is compatible with the
unified hierarchy, hence that's the only controller systemd exposes when
booted in unified heirarchy mode.
This introduces a new enum for enumerating supported controllers, plus a
related enum for the mask bits mapping to it. The core is changed to
make use of this everywhere.
This moves PID 1 into a new "init.scope" implicit scope unit in the root
slice. This is necessary since on the unified hierarchy cgroups may
either contain subgroups or processes but not both. PID 1 hence has to
move out of the root cgroup (strictly speaking the root cgroup is the
only one where processes and subgroups are still allowed, but in order
to support containers nicey, we move PID 1 into the new scope in all
cases.) This new unit is also used on legacy hierarchy setups. It's
actually pretty useful on all systems, as it can then be used to filter
journal messages coming from PID 1, and so on.
The root slice ("-.slice") is now implicitly created and started (and
does not require a unit file on disk anymore), since
that's where "init.scope" is located and the slice needs to be started
before the scope can.
To check whether we are in unified or legacy hierarchy mode we use
statfs() on /sys/fs/cgroup. If the .f_type field reports tmpfs we are in
legacy mode, if it reports cgroupfs we are in unified mode.
This patch set carefuly makes sure that cgls and cgtop continue to work
as desired.
When invoking nspawn as a service it will implicitly create two
subcgroups in the cgroup it is using, one to move the nspawn process
into, the other to move the actual container processes into. This is
done because of the requirement that cgroups may either contain
processes or other subgroups.
2015-09-01 19:22:36 +02:00
|
|
|
* should not exist in non-delegated units. On
|
|
|
|
* the unified hierarchy that's different,
|
|
|
|
* there we get proper events. Hence rely on
|
|
|
|
* them.*/
|
|
|
|
|
|
|
|
if (cg_unified() > 0 ||
|
2015-09-07 13:42:47 +02:00
|
|
|
(detect_container() == 0 && !unit_cgroup_delegate(u)))
|
2015-09-01 17:25:59 +02:00
|
|
|
wait_for_exit = true;
|
2014-01-29 13:38:55 +01:00
|
|
|
|
2014-10-28 16:35:40 +01:00
|
|
|
if (c->send_sighup && k != KILL_KILL) {
|
2013-07-30 01:54:59 +02:00
|
|
|
set_free(pid_set);
|
|
|
|
|
|
|
|
pid_set = unit_pid_set(main_pid, control_pid);
|
|
|
|
if (!pid_set)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-02-06 19:46:46 +01:00
|
|
|
cg_kill_recursive(SYSTEMD_CGROUP_CONTROLLER, u->cgroup_path, SIGHUP, false, true, false, pid_set);
|
2013-07-30 01:54:59 +02:00
|
|
|
}
|
|
|
|
}
|
2013-01-26 05:53:30 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return wait_for_exit;
|
|
|
|
}
|
|
|
|
|
2013-09-26 20:14:24 +02:00
|
|
|
int unit_require_mounts_for(Unit *u, const char *path) {
|
|
|
|
char prefix[strlen(path) + 1], *p;
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(path);
|
|
|
|
|
|
|
|
/* Registers a unit for requiring a certain path and all its
|
|
|
|
* prefixes. We keep a simple array of these paths in the
|
|
|
|
* unit, since its usually short. However, we build a prefix
|
|
|
|
* table for all possible prefixes so that new appearing mount
|
|
|
|
* units can easily determine which units to make themselves a
|
|
|
|
* dependency of. */
|
|
|
|
|
2014-01-27 07:23:16 +01:00
|
|
|
if (!path_is_absolute(path))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2013-09-26 20:14:24 +02:00
|
|
|
p = strdup(path);
|
|
|
|
if (!p)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
path_kill_slashes(p);
|
|
|
|
|
|
|
|
if (!path_is_safe(p)) {
|
|
|
|
free(p);
|
|
|
|
return -EPERM;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (strv_contains(u->requires_mounts_for, p)) {
|
|
|
|
free(p);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-03-04 15:20:51 +01:00
|
|
|
r = strv_consume(&u->requires_mounts_for, p);
|
|
|
|
if (r < 0)
|
2013-09-26 20:14:24 +02:00
|
|
|
return r;
|
|
|
|
|
|
|
|
PATH_FOREACH_PREFIX_MORE(prefix, p) {
|
|
|
|
Set *x;
|
|
|
|
|
|
|
|
x = hashmap_get(u->manager->units_requiring_mounts_for, prefix);
|
|
|
|
if (!x) {
|
|
|
|
char *q;
|
|
|
|
|
2015-04-24 19:54:29 +02:00
|
|
|
r = hashmap_ensure_allocated(&u->manager->units_requiring_mounts_for, &string_hash_ops);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
2013-09-26 20:14:24 +02:00
|
|
|
|
|
|
|
q = strdup(prefix);
|
|
|
|
if (!q)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2014-08-13 01:00:18 +02:00
|
|
|
x = set_new(NULL);
|
2013-09-26 20:14:24 +02:00
|
|
|
if (!x) {
|
|
|
|
free(q);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = hashmap_put(u->manager->units_requiring_mounts_for, q, x);
|
|
|
|
if (r < 0) {
|
|
|
|
free(q);
|
|
|
|
set_free(x);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
r = set_put(x, u);
|
|
|
|
if (r < 0)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-11-27 20:23:18 +01:00
|
|
|
int unit_setup_exec_runtime(Unit *u) {
|
|
|
|
ExecRuntime **rt;
|
|
|
|
size_t offset;
|
|
|
|
Iterator i;
|
|
|
|
Unit *other;
|
|
|
|
|
|
|
|
offset = UNIT_VTABLE(u)->exec_runtime_offset;
|
|
|
|
assert(offset > 0);
|
|
|
|
|
2014-08-30 17:13:16 +02:00
|
|
|
/* Check if there already is an ExecRuntime for this unit? */
|
2013-11-27 20:23:18 +01:00
|
|
|
rt = (ExecRuntime**) ((uint8_t*) u + offset);
|
|
|
|
if (*rt)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Try to get it from somebody else */
|
|
|
|
SET_FOREACH(other, u->dependencies[UNIT_JOINS_NAMESPACE_OF], i) {
|
|
|
|
|
|
|
|
*rt = unit_get_exec_runtime(other);
|
|
|
|
if (*rt) {
|
|
|
|
exec_runtime_ref(*rt);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return exec_runtime_make(rt, unit_get_exec_context(u), u->id);
|
|
|
|
}
|
|
|
|
|
2015-04-30 01:29:00 +02:00
|
|
|
bool unit_type_supported(UnitType t) {
|
|
|
|
if (_unlikely_(t < 0))
|
|
|
|
return false;
|
|
|
|
if (_unlikely_(t >= _UNIT_TYPE_MAX))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (!unit_vtable[t]->supported)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return unit_vtable[t]->supported();
|
|
|
|
}
|
|
|
|
|
2015-05-11 22:28:52 +02:00
|
|
|
void unit_warn_if_dir_nonempty(Unit *u, const char* where) {
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(where);
|
|
|
|
|
|
|
|
r = dir_is_empty(where);
|
|
|
|
if (r > 0)
|
|
|
|
return;
|
|
|
|
if (r < 0) {
|
|
|
|
log_unit_warning_errno(u, r, "Failed to check directory %s: %m", where);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
log_struct(LOG_NOTICE,
|
|
|
|
LOG_MESSAGE_ID(SD_MESSAGE_OVERMOUNTING),
|
|
|
|
LOG_UNIT_ID(u),
|
|
|
|
LOG_UNIT_MESSAGE(u, "Directory %s to mount over is not empty, mounting anyway.", where),
|
|
|
|
"WHERE=%s", where,
|
|
|
|
NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
int unit_fail_if_symlink(Unit *u, const char* where) {
|
|
|
|
int r;
|
|
|
|
|
|
|
|
assert(u);
|
|
|
|
assert(where);
|
|
|
|
|
|
|
|
r = is_symlink(where);
|
|
|
|
if (r < 0) {
|
|
|
|
log_unit_debug_errno(u, r, "Failed to check symlink %s, ignoring: %m", where);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (r == 0)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
log_struct(LOG_ERR,
|
|
|
|
LOG_MESSAGE_ID(SD_MESSAGE_OVERMOUNTING),
|
|
|
|
LOG_UNIT_ID(u),
|
|
|
|
LOG_UNIT_MESSAGE(u, "Mount on symlink %s not allowed.", where),
|
|
|
|
"WHERE=%s", where,
|
|
|
|
NULL);
|
|
|
|
|
|
|
|
return -ELOOP;
|
|
|
|
}
|
2015-11-17 14:04:40 +01:00
|
|
|
|
|
|
|
bool unit_is_pristine(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
2015-11-17 14:09:16 +01:00
|
|
|
/* Check if the unit already exists or is already around,
|
2015-11-17 14:04:40 +01:00
|
|
|
* in a number of different ways. Note that to cater for unit
|
|
|
|
* types such as slice, we are generally fine with units that
|
|
|
|
* are marked UNIT_LOADED even even though nothing was
|
|
|
|
* actually loaded, as those unit types don't require a file
|
|
|
|
* on disk to validly load. */
|
|
|
|
|
|
|
|
return !(!IN_SET(u->load_state, UNIT_NOT_FOUND, UNIT_LOADED) ||
|
|
|
|
u->fragment_path ||
|
|
|
|
u->source_path ||
|
|
|
|
!strv_isempty(u->dropin_paths) ||
|
|
|
|
u->job ||
|
|
|
|
u->merged_into);
|
|
|
|
}
|
2016-04-20 15:28:28 +02:00
|
|
|
|
|
|
|
pid_t unit_control_pid(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->control_pid)
|
|
|
|
return UNIT_VTABLE(u)->control_pid(u);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
pid_t unit_main_pid(Unit *u) {
|
|
|
|
assert(u);
|
|
|
|
|
|
|
|
if (UNIT_VTABLE(u)->main_pid)
|
|
|
|
return UNIT_VTABLE(u)->main_pid(u);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|