Commit c8f4d764 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

manager: introduce IgnoreOnIsolate flag so that we can keep systemd-logger around when isolating

parent cfcab435
......@@ -460,6 +460,16 @@
<option>false</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>IgnoreOnIsolate=</varname></term>
<listitem><para>Takes a boolean
argument. If <option>true</option>
this unit will not be stopped when
isolating another unit. Defaults to
<option>false</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>StopWhenUnneeded=</varname></term>
......
......@@ -58,6 +58,8 @@ static void automount_init(Unit *u) {
a->pipe_watch.type = WATCH_INVALID;
a->directory_mode = 0755;
a->meta.ignore_on_isolate = true;
}
static void repeat_unmout(const char *path) {
......
......@@ -93,15 +93,18 @@
" <property name=\"ActiveExitTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
" <property name=\"InactiveEnterTimestamp\" type=\"t\" access=\"read\"/>\n" \
" <property name=\"InactiveEnterTimestampMonotonic\" type=\"t\" access=\"read\"/>\n" \
" <property name=\"CanReload\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"CanStart\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"CanStop\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"CanReload\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"CanIsolate\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"Job\" type=\"(uo)\" access=\"read\"/>\n" \
" <property name=\"StopWhenUnneeded\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"RefuseManualStart\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"RefuseManualStop\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"AllowIsolate\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"DefaultDependencies\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"OnFailureIsolate\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"IgnoreOnIsolate\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"DefaultControlGroup\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"ControlGroup\" type=\"as\" access=\"read\"/>\n" \
" <property name=\"NeedDaemonReload\" type=\"b\" access=\"read\"/>\n" \
......@@ -158,6 +161,7 @@
{ "org.freedesktop.systemd1.Unit", "AllowIsolate", bus_property_append_bool, "b", &u->meta.allow_isolate }, \
{ "org.freedesktop.systemd1.Unit", "DefaultDependencies", bus_property_append_bool, "b", &u->meta.default_dependencies }, \
{ "org.freedesktop.systemd1.Unit", "OnFailureIsolate", bus_property_append_bool, "b", &u->meta.on_failure_isolate }, \
{ "org.freedesktop.systemd1.Unit", "IgnoreOnIsolate", bus_property_append_bool, "b", &u->meta.ignore_on_isolate }, \
{ "org.freedesktop.systemd1.Unit", "DefaultControlGroup", bus_unit_append_default_cgroup, "s", u }, \
{ "org.freedesktop.systemd1.Unit", "ControlGroup", bus_unit_append_cgroups, "as", u }, \
{ "org.freedesktop.systemd1.Unit", "NeedDaemonReload", bus_unit_append_need_daemon_reload, "b", u }, \
......
......@@ -70,6 +70,8 @@ static void device_init(Unit *u) {
* happen for the other units since their operations time out
* anyway. */
d->meta.job_timeout = DEFAULT_TIMEOUT_USEC;
d->meta.ignore_on_isolate = true;
}
static void device_done(Unit *u) {
......@@ -583,7 +585,6 @@ const UnitVTable device_vtable = {
.no_instances = true,
.no_snapshots = true,
.no_isolate = true,
.init = device_init,
......
......@@ -1861,6 +1861,7 @@ static int load_from_path(Unit *u, const char *path) {
{ "AllowIsolate", config_parse_bool, 0, &u->meta.allow_isolate, "Unit" },
{ "DefaultDependencies", config_parse_bool, 0, &u->meta.default_dependencies, "Unit" },
{ "OnFailureIsolate", config_parse_bool, 0, &u->meta.on_failure_isolate, "Unit" },
{ "IgnoreOnIsolate", config_parse_bool, 0, &u->meta.ignore_on_isolate, "Unit" },
{ "JobTimeoutSec", config_parse_usec, 0, &u->meta.job_timeout, "Unit" },
{ "ConditionPathExists", config_parse_condition_path, CONDITION_PATH_EXISTS, u, "Unit" },
{ "ConditionPathIsDirectory", config_parse_condition_path, CONDITION_PATH_IS_DIRECTORY, u, "Unit" },
......
......@@ -1619,7 +1619,7 @@ static int transaction_add_isolate_jobs(Manager *m) {
if (u->meta.id != k)
continue;
if (UNIT_VTABLE(u)->no_isolate)
if (u->meta.ignore_on_isolate)
continue;
/* No need to stop inactive jobs */
......
......@@ -80,6 +80,8 @@ static void mount_init(Unit *u) {
m->timer_watch.type = WATCH_INVALID;
m->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
m->meta.ignore_on_isolate = true;
}
static void mount_unwatch_control_pid(Mount *m) {
......@@ -1763,7 +1765,6 @@ const UnitVTable mount_vtable = {
.no_alias = true,
.no_instances = true,
.no_isolate = true,
.show_status = true,
.init = mount_init,
......
......@@ -90,6 +90,8 @@ static void swap_unset_proc_swaps(Swap *s) {
s->timer_watch.type = WATCH_INVALID;
s->control_command_id = _MOUNT_EXEC_COMMAND_INVALID;
s->meta.ignore_on_isolate = true;
}
static void swap_unwatch_control_pid(Swap *s) {
......@@ -1339,7 +1341,6 @@ const UnitVTable swap_vtable = {
.no_alias = true,
.no_instances = true,
.no_isolate = true,
.show_status = true,
.init = swap_init,
......
......@@ -664,12 +664,14 @@ void unit_dump(Unit *u, FILE *f, const char *prefix) {
"%s\tRefuseManualStart: %s\n"
"%s\tRefuseManualStop: %s\n"
"%s\tDefaultDependencies: %s\n"
"%s\tOnFailureIsolate: %s\n",
"%s\tOnFailureIsolate: %s\n"
"%s\tIgnoreOnIsolate: %s\n",
prefix, yes_no(u->meta.stop_when_unneeded),
prefix, yes_no(u->meta.refuse_manual_start),
prefix, yes_no(u->meta.refuse_manual_stop),
prefix, yes_no(u->meta.default_dependencies),
prefix, yes_no(u->meta.on_failure_isolate));
prefix, yes_no(u->meta.on_failure_isolate),
prefix, yes_no(u->meta.ignore_on_isolate));
LIST_FOREACH(by_unit, b, u->meta.cgroup_bondings)
fprintf(f, "%s\tControlGroup: %s:%s\n",
......
......@@ -210,6 +210,9 @@ struct Meta {
/* Isolate OnFailure unit */
bool on_failure_isolate;
/* Ignore this unit when isolating */
bool ignore_on_isolate;
/* Did the last condition check suceed? */
bool condition_result;
......@@ -367,9 +370,6 @@ struct UnitVTable {
/* Exclude from automatic gc */
bool no_gc:1;
/* Exclude from stopping on isolation requests */
bool no_isolate:1;
/* Show status updates on the console */
bool show_status:1;
};
......
......@@ -12,5 +12,10 @@ Description=Stdio Syslog Bridge Socket
DefaultDependencies=no
Before=sockets.target
# Mount and swap units need this. If this socket unit is removed by an
# isolate request the mount and and swap units would be removed too,
# hence let's exclude this from isolate requests.
IgnoreOnIsolate=yes
[Socket]
ListenStream=/run/systemd/logger
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment