previously unprovisioned images (i.e. images with a mostly empty
/etc/).
- * Services gained a new ExitType= setting which can configure how to
- determine when a service exited: the default is "main" which defines
- the runtime by the service's main process lifetime (this matches the
- only behaviour implemented in v248 and before), but with "cgroup" the
- runtime is defined by the existence of any process in the service's
- cgroup.
-
* The systemd-machine-id-setup tool now supports a --image= switch for
provisioning a machine ID file into an OS disk image, similar to how
--root= operates on an OS file tree. This matches the existing switch
✓ ExecStartPre=
✓ ExecStop=
✓ ExecStopPost=
-✓ ExitType=
✓ FileDescriptorStoreMax=
✓ GuessMainPID=
✓ NonBlocking=
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s Type = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
- readonly s ExitType = '...';
- @org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s Restart = '...';
@org.freedesktop.DBus.Property.EmitsChangedSignal("const")
readonly s PIDFile = '...';
<!--property Type is not documented!-->
- <!--property ExitType is not documented!-->
-
<!--property Restart is not documented!-->
<!--property PIDFile is not documented!-->
<variablelist class="dbus-property" generated="True" extra-ref="Type"/>
- <variablelist class="dbus-property" generated="True" extra-ref="ExitType"/>
-
<variablelist class="dbus-property" generated="True" extra-ref="Restart"/>
<variablelist class="dbus-property" generated="True" extra-ref="PIDFile"/>
</listitem>
</varlistentry>
- <varlistentry>
- <term><varname>ExitType=</varname></term>
-
- <listitem>
- <para>Configures the process exit type for this service unit. One of <option>main</option> or
- <option>cgroup</option>:</para>
-
- <itemizedlist>
- <listitem><para>If set to <option>main</option> (the default), the service manager
- will consider the unit stopped when the main process, which is determined according to the `Type`, exits.
- </para></listitem>
-
- <listitem><para>The <option>cgroup</option> exit type is meant for applications whose forking model is not
- known ahead of time and which might not have a specific main process. The service will stay running as long
- as at least one process in the cgroup is running. The exit status of the service is that of the last
- process in the cgroup to exit.</para></listitem>
- </itemizedlist>
-
- <para>It is generally recommended to use <varname>ExitType=</varname><option>main</option> when a service has
- a known forking model and a main process can reliably be determined. <varname>ExitType=</varname>
- <option>cgroup</option> is well suited for transient or automatically generated services, such as graphical
- applications inside of a desktop environment.</para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><varname>RemainAfterExit=</varname></term>
-p|--property)
local comps='CPUAccounting= MemoryAccounting= BlockIOAccounting= SendSIGHUP=
SendSIGKILL= MemoryLimit= CPUShares= BlockIOWeight= User= Group=
- DevicePolicy= KillMode= ExitType= DeviceAllow= BlockIOReadBandwidth=
+ DevicePolicy= KillMode= DeviceAllow= BlockIOReadBandwidth=
BlockIOWriteBandwidth= BlockIODeviceWeight= Nice= Environment=
KillSignal= RestartKillSignal= FinalKillSignal= LimitCPU= LimitFSIZE= LimitDATA=
LimitSTACK= LimitCORE= LimitRSS= LimitNOFILE= LimitAS= LimitNPROC=
{-p+,--property=}'[Set unit property]:NAME=VALUE:(( \
CPUAccounting= MemoryAccounting= BlockIOAccounting= SendSIGHUP= \
SendSIGKILL= MemoryLimit= CPUShares= BlockIOWeight= User= Group= \
- DevicePolicy= KillMode= ExitType= DeviceAllow= BlockIOReadBandwidth= \
+ DevicePolicy= KillMode= DeviceAllow= BlockIOReadBandwidth= \
BlockIOWriteBandwidth= BlockIODeviceWeight= Nice= Environment= \
KillSignal= RestartKillSignal= FinalKillSignal= LimitCPU= LimitFSIZE= LimitDATA= \
LimitSTACK= LimitCORE= LimitRSS= LimitNOFILE= LimitAS= LimitNPROC= \
#include "unit.h"
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_type, service_type, ServiceType);
-static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_exit_type, service_exit_type, ServiceExitType);
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_result, service_result, ServiceResult);
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_restart, service_restart, ServiceRestart);
static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_notify_access, notify_access, NotifyAccess);
const sd_bus_vtable bus_service_vtable[] = {
SD_BUS_VTABLE_START(0),
SD_BUS_PROPERTY("Type", "s", property_get_type, offsetof(Service, type), SD_BUS_VTABLE_PROPERTY_CONST),
- SD_BUS_PROPERTY("ExitType", "s", property_get_exit_type, offsetof(Service, exit_type), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("Restart", "s", property_get_restart, offsetof(Service, restart), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("PIDFile", "s", NULL, offsetof(Service, pid_file), SD_BUS_VTABLE_PROPERTY_CONST),
SD_BUS_PROPERTY("NotifyAccess", "s", property_get_notify_access, offsetof(Service, notify_access), SD_BUS_VTABLE_PROPERTY_CONST),
}
static BUS_DEFINE_SET_TRANSIENT_PARSE(notify_access, NotifyAccess, notify_access_from_string);
static BUS_DEFINE_SET_TRANSIENT_PARSE(service_type, ServiceType, service_type_from_string);
-static BUS_DEFINE_SET_TRANSIENT_PARSE(service_exit_type, ServiceExitType, service_exit_type_from_string);
static BUS_DEFINE_SET_TRANSIENT_PARSE(service_restart, ServiceRestart, service_restart_from_string);
static BUS_DEFINE_SET_TRANSIENT_PARSE(oom_policy, OOMPolicy, oom_policy_from_string);
static BUS_DEFINE_SET_TRANSIENT_STRING_WITH_CHECK(bus_name, sd_bus_service_name_is_valid);
if (streq(name, "Type"))
return bus_set_transient_service_type(u, name, &s->type, message, flags, error);
- if (streq(name, "ExitType"))
- return bus_set_transient_service_exit_type(u, name, &s->exit_type, message, flags, error);
-
if (streq(name, "OOMPolicy"))
return bus_set_transient_oom_policy(u, name, &s->oom_policy, message, flags, error);
Service.FailureAction, config_parse_emergency_action, 0, offsetof(Unit, failure_action)
Service.RebootArgument, config_parse_unit_string_printf, 0, offsetof(Unit, reboot_arg)
Service.Type, config_parse_service_type, 0, offsetof(Service, type)
-Service.ExitType, config_parse_service_exit_type, 0, offsetof(Service, exit_type)
Service.Restart, config_parse_service_restart, 0, offsetof(Service, restart)
Service.PermissionsStartOnly, config_parse_bool, 0, offsetof(Service, permissions_start_only)
Service.RootDirectoryStartOnly, config_parse_bool, 0, offsetof(Service, root_directory_start_only)
DEFINE_CONFIG_PARSE_ENUM(config_parse_protect_system, protect_system, ProtectSystem, "Failed to parse protect system value");
DEFINE_CONFIG_PARSE_ENUM(config_parse_runtime_preserve_mode, exec_preserve_mode, ExecPreserveMode, "Failed to parse runtime directory preserve mode");
DEFINE_CONFIG_PARSE_ENUM(config_parse_service_type, service_type, ServiceType, "Failed to parse service type");
-DEFINE_CONFIG_PARSE_ENUM(config_parse_service_exit_type, service_exit_type, ServiceExitType, "Failed to parse service exit type");
DEFINE_CONFIG_PARSE_ENUM(config_parse_service_restart, service_restart, ServiceRestart, "Failed to parse service restart specifier");
DEFINE_CONFIG_PARSE_ENUM(config_parse_service_timeout_failure_mode, service_timeout_failure_mode, ServiceTimeoutFailureMode, "Failed to parse timeout failure mode");
DEFINE_CONFIG_PARSE_ENUM(config_parse_socket_bind, socket_address_bind_ipv6_only_or_bool, SocketAddressBindIPv6Only, "Failed to parse bind IPv6 only value");
{ config_parse_unit_deps, "UNIT [...]" },
{ config_parse_exec, "PATH [ARGUMENT [...]]" },
{ config_parse_service_type, "SERVICETYPE" },
- { config_parse_service_exit_type, "SERVICEEXITTYPE" },
{ config_parse_service_restart, "SERVICERESTART" },
{ config_parse_service_timeout_failure_mode, "TIMEOUTMODE" },
{ config_parse_kill_mode, "KILLMODE" },
CONFIG_PARSER_PROTOTYPE(config_parse_service_timeout_abort);
CONFIG_PARSER_PROTOTYPE(config_parse_service_timeout_failure_mode);
CONFIG_PARSER_PROTOTYPE(config_parse_service_type);
-CONFIG_PARSER_PROTOTYPE(config_parse_service_exit_type);
CONFIG_PARSER_PROTOTYPE(config_parse_service_restart);
CONFIG_PARSER_PROTOTYPE(config_parse_socket_bindtodevice);
CONFIG_PARSER_PROTOTYPE(config_parse_exec_output);
return s->control_pid > 0;
}
-static int cgroup_empty(Service *s) {
- assert(s);
-
- /* Returns 0 if there is no cgroup, > 0 if is empty or doesn't exist, < 0 if we can't figure it out */
-
- if (!UNIT(s)->cgroup_path)
- return 0;
-
- return cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, UNIT(s)->cgroup_path);
-}
-
-
static int cgroup_good(Service *s) {
int r;
+ assert(s);
+
/* Returns 0 if the cgroup is empty or doesn't exist, > 0 if it is exists and is populated, < 0 if we can't
* figure it out */
- r = cgroup_empty(s);
+ if (!UNIT(s)->cgroup_path)
+ return 0;
+
+ r = cg_is_empty_recursive(SYSTEMD_CGROUP_CONTROLLER, UNIT(s)->cgroup_path);
if (r < 0)
return r;
else
assert_not_reached("Unknown code");
- /* Services with ExitType=cgroup ignore the main PID for purposes of exit status */
- if (s->exit_type == SERVICE_EXIT_CGROUP && s->main_pid == pid) {
- service_unwatch_main_pid(s);
- s->main_pid_known = false;
- }
-
- if ((s->exit_type == SERVICE_EXIT_MAIN && s->main_pid == pid) ||
- (s->exit_type == SERVICE_EXIT_CGROUP && cgroup_empty(s) && !control_pid_good(s))) {
+ if (s->main_pid == pid) {
/* Forking services may occasionally move to a new PID.
* As long as they update the PID file before exiting the old
* PID, they're fine. */
unit_log_process_exit(
u,
- s->exit_type == SERVICE_EXIT_CGROUP ? "Last process" : "Main process",
+ "Main process",
service_exec_command_to_string(SERVICE_EXEC_START),
f == SERVICE_SUCCESS,
code, status);
DEFINE_STRING_TABLE_LOOKUP(service_type, ServiceType);
-static const char* const service_exit_type_table[_SERVICE_EXIT_TYPE_MAX] = {
- [SERVICE_EXIT_MAIN] = "main",
- [SERVICE_EXIT_CGROUP] = "cgroup",
-};
-
-DEFINE_STRING_TABLE_LOOKUP(service_exit_type, ServiceExitType);
-
static const char* const service_exec_command_table[_SERVICE_EXEC_COMMAND_MAX] = {
[SERVICE_EXEC_CONDITION] = "ExecCondition",
[SERVICE_EXEC_START_PRE] = "ExecStartPre",
_SERVICE_TYPE_INVALID = -EINVAL,
} ServiceType;
-typedef enum ServiceExitType {
- SERVICE_EXIT_MAIN, /* we consider the main PID when deciding if the service exited */
- SERVICE_EXIT_CGROUP, /* we wait for the last process in the cgroup to exit */
- _SERVICE_EXIT_TYPE_MAX,
- _SERVICE_EXIT_TYPE_INVALID = -EINVAL,
-} ServiceExitType;
-
typedef enum ServiceExecCommand {
SERVICE_EXEC_CONDITION,
SERVICE_EXEC_START_PRE,
Unit meta;
ServiceType type;
- ServiceExitType exit_type;
ServiceRestart restart;
ExitStatusSet restart_prevent_status;
ExitStatusSet restart_force_status;
const char* service_type_to_string(ServiceType i) _const_;
ServiceType service_type_from_string(const char *s) _pure_;
-const char* service_exit_type_to_string(ServiceExitType i) _const_;
-ServiceExitType service_exit_type_from_string(const char *s) _pure_;
-
const char* service_exec_command_to_string(ServiceExecCommand i) _const_;
ServiceExecCommand service_exec_command_from_string(const char *s) _pure_;
if (STR_IN_SET(field, "PIDFile",
"Type",
- "ExitType",
"Restart",
"BusName",
"NotifyAccess",
fprintf(f,
"\n[Service]\n"
"Type=exec\n"
- "ExitType=cgroup\n"
"ExecStart=:%s\n"
"Restart=no\n"
"TimeoutSec=5s\n"
+++ /dev/null
-../TEST-01-BASIC/Makefile
\ No newline at end of file
+++ /dev/null
-#!/usr/bin/env bash
-set -e
-
-TEST_DESCRIPTION="test ExitType=cgroup"
-
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
-do_test "$@"
ExecStartPre=
ExecStop=
ExecStopPost=
-ExitType=
ExtensionImages=
FailureAction=
FileDescriptorStoreMax=
+++ /dev/null
-[Unit]
-Description=TEST-56-EXIT-TYPE
-
-[Service]
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot
+++ /dev/null
-#!/usr/bin/env bash
-set -eux
-
-systemd-analyze log-level debug
-
-# Multiple level process tree, parent process stays up
-cat >/tmp/test56-exit-cgroup.sh <<EOF
-#!/usr/bin/env bash
-set -eux
-
-# process tree: systemd -> sleep
-sleep infinity &
-disown
-
-# process tree: systemd -> bash -> bash -> sleep
-((sleep infinity); true) &
-
-# process tree: systemd -> bash -> sleep
-sleep infinity
-EOF
-chmod +x /tmp/test56-exit-cgroup.sh
-
-# service should be stopped cleanly
-(sleep 1; systemctl stop one) &
-systemd-run --wait --unit=one -p ExitType=cgroup /tmp/test56-exit-cgroup.sh
-
-# same thing with a truthy exec condition
-(sleep 1; systemctl stop two) &
-systemd-run --wait --unit=two -p ExitType=cgroup -p ExecCondition=true /tmp/test56-exit-cgroup.sh
-
-# false exec condition: systemd-run should exit immediately with status code: 1
-systemd-run --wait --unit=three -p ExitType=cgroup -p ExecCondition=false /tmp/test56-exit-cgroup.sh \
- && { echo 'unexpected success'; exit 1; }
-
-# service should exit uncleanly
-(sleep 1; systemctl kill --signal 9 four) &
-systemd-run --wait --unit=four -p ExitType=cgroup /tmp/test56-exit-cgroup.sh \
- && { echo 'unexpected success'; exit 1; }
-
-
-# Multiple level process tree, parent process exits quickly
-cat >/tmp/test56-exit-cgroup-parentless.sh <<EOF
-#!/usr/bin/env bash
-set -eux
-
-# process tree: systemd -> sleep
-sleep infinity &
-
-# process tree: systemd -> bash -> sleep
-((sleep infinity); true) &
-EOF
-chmod +x /tmp/test56-exit-cgroup-parentless.sh
-
-# service should be stopped cleanly
-(sleep 1; systemctl stop five) &
-systemd-run --wait --unit=five -p ExitType=cgroup /tmp/test56-exit-cgroup-parentless.sh
-
-# service should exit uncleanly
-(sleep 1; systemctl kill --signal 9 six) &
-systemd-run --wait --unit=six -p ExitType=cgroup /tmp/test56-exit-cgroup-parentless.sh \
- && { echo 'unexpected success'; exit 1; }
-
-
-# Multiple level process tree, parent process exits uncleanly but last process exits cleanly
-cat >/tmp/test56-exit-cgroup-clean.sh <<EOF
-#!/usr/bin/env bash
-set -eux
-
-# process tree: systemd -> bash -> sleep
-(sleep 1; true) &
-
-exit 255
-EOF
-chmod +x /tmp/test56-exit-cgroup-clean.sh
-
-# service should exit cleanly and be garbage-collected
-systemd-run --wait --unit=seven -p ExitType=cgroup /tmp/test56-exit-cgroup-clean.sh
-
-
-# Multiple level process tree, parent process exits cleanly but last process exits uncleanly
-cat >/tmp/test56-exit-cgroup-unclean.sh <<EOF
-#!/usr/bin/env bash
-set -eux
-
-# process tree: systemd -> bash -> sleep
-(sleep 1; exit 255) &
-EOF
-chmod +x /tmp/test56-exit-cgroup-unclean.sh
-
-# service should exit uncleanly after 1 second
-systemd-run --wait --unit=eight -p ExitType=cgroup /tmp/test56-exit-cgroup-unclean.sh \
- && { echo 'unexpected success'; exit 1; }
-
-systemd-analyze log-level info
-
-echo OK >/testok
-
-exit 0
projects / thirdparty / systemd.git / commitdiff
