picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

systemd: introduced new timeout types 

Makes possible to specify separate timeout for start and stop of
the service.

[ Improved the manpage. Coding style fix. -- michich ]
This commit is contained in:
Michal Sekletar 2012-08-07 14:41:48 +02:00 committed by Michal Schmidt
parent 7781e063e8
commit d568a3350e
6 changed files with 75 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
man/systemd.service.xml
View File

@ -463,27 +463,49 @@
</varlistentry>
<varlistentry>
<term><varname>TimeoutSec=</varname></term>
<term><varname>TimeoutStartSec=</varname></term>
<listitem><para>Configures the time to
wait for start-up and stop. If a
wait for start-up. If a
daemon service does not signal
start-up completion within the
configured time the service will be
configured time, the service will be
considered failed and be shut down
again. If a service is asked to stop
but does not terminate in the
specified time it will be terminated
forcibly via SIGTERM, and after
another delay of this time with
SIGKILL. (See
<varname>KillMode=</varname>
in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>) Takes a unit-less value in seconds, or a
again.
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to
90s, except when <varname>Type=oneshot</varname> is
logic. Defaults to 90s, except when
<varname>Type=oneshot</varname> is
used in which case the timeout
is disabled by default.</para></listitem>
is disabled by default.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>TimeoutStopSec=</varname></term>
<listitem><para>Configures the time to
wait for stop. If a service is asked
to stop but does not terminate in the
specified time, it will be terminated
forcibly via SIGTERM, and after
another delay of this time with
SIGKILL (See
<varname>KillMode=</varname>
in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>).
Takes a unit-less value in seconds, or a
time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to 90s.
</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>TimeoutSec=</varname></term>
<listitem><para>A shorthand for configuring
both <varname>TimeoutStartSec=</varname>
and <varname>TimeoutStopSec=</varname>
to the specified value.
</para></listitem>
</varlistentry>
<varlistentry>

4
src/core/dbus-service.c
View File

@ -115,7 +115,9 @@ static const BusProperty bus_service_properties[] = {
{ "PIDFile", bus_property_append_string, "s", offsetof(Service, pid_file), true },
{ "NotifyAccess", bus_service_append_notify_access, "s", offsetof(Service, notify_access) },
{ "RestartUSec", bus_property_append_usec, "t", offsetof(Service, restart_usec) },
{ "TimeoutUSec", bus_property_append_usec, "t", offsetof(Service, timeout_usec) },
{ "TimeoutUSec", bus_property_append_usec, "t", offsetof(Service, timeout_start_usec) },
{ "TimeoutStartUSec", bus_property_append_usec, "t", offsetof(Service, timeout_start_usec) },
{ "TimeoutStopUSec", bus_property_append_usec, "t", offsetof(Service, timeout_stop_usec) },
{ "WatchdogUSec", bus_property_append_usec, "t", offsetof(Service, watchdog_usec) },
{ "WatchdogTimestamp", bus_property_append_usec, "t", offsetof(Service, watchdog_timestamp.realtime) },
{ "WatchdogTimestampMonotonic",bus_property_append_usec, "t", offsetof(Service, watchdog_timestamp.monotonic) },

4
src/core/load-fragment-gperf.gperf.m4
View File

@ -145,7 +145,9 @@ Service.ExecReload, config_parse_exec, SERVICE_EXE
Service.ExecStop, config_parse_exec, SERVICE_EXEC_STOP, offsetof(Service, exec_command)
Service.ExecStopPost, config_parse_exec, SERVICE_EXEC_STOP_POST, offsetof(Service, exec_command)
Service.RestartSec, config_parse_usec, 0, offsetof(Service, restart_usec)
Service.TimeoutSec, config_parse_service_timeout, 0, offsetof(Service, timeout_usec)
Service.TimeoutSec, config_parse_service_timeout, 0, offsetof(Service, timeout_start_usec)
Service.TimeoutStartSec, config_parse_service_timeout, 0, offsetof(Service, timeout_start_usec)
Service.TimeoutStopSec, config_parse_service_timeout, 0, offsetof(Service, timeout_stop_usec)
Service.WatchdogSec, config_parse_usec, 0, offsetof(Service, watchdog_usec)
Service.StartLimitInterval, config_parse_usec, 0, offsetof(Service, start_limit.interval)
Service.StartLimitBurst, config_parse_unsigned, 0, offsetof(Service, start_limit.burst)

12
src/core/load-fragment.c
View File

@ -1376,10 +1376,16 @@ int config_parse_service_timeout(
r = config_parse_usec(filename, line, section, lvalue, ltype, rvalue, data, userdata);
if (!r)
s->timeout_defined = true;
if (r)
return r;
return r;
if (streq(lvalue, "TimeoutSec")) {
s->start_timeout_defined = true;
s->timeout_stop_usec = s->timeout_start_usec;
} else if (streq(lvalue, "TimeoutStartSec"))
s->start_timeout_defined = true;
return 0;
}
int config_parse_unit_env_file(

35
src/core/service.c
View File

@ -134,7 +134,8 @@ static void service_init(Unit *u) {
assert(u);
assert(u->load_state == UNIT_STUB);
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
s->timeout_start_usec = DEFAULT_TIMEOUT_USEC;
s->timeout_stop_usec = DEFAULT_TIMEOUT_USEC;
s->restart_usec = DEFAULT_RESTART_USEC;
s->type = _SERVICE_TYPE_INVALID;
@ -914,9 +915,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
UNIT(s)->default_dependencies = false;
/* Don't timeout special services during boot (like fsck) */
s->timeout_usec = 0;
} else
s->timeout_usec = DEFAULT_SYSV_TIMEOUT_USEC;
s->timeout_start_usec = 0;
s->timeout_stop_usec = 0;
} else {
s->timeout_start_usec = DEFAULT_SYSV_TIMEOUT_USEC;
s->timeout_stop_usec = DEFAULT_SYSV_TIMEOUT_USEC;
}
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
@ -1241,9 +1246,9 @@ static int service_load(Unit *u) {
if (s->type == _SERVICE_TYPE_INVALID)
s->type = s->bus_name ? SERVICE_DBUS : SERVICE_SIMPLE;
/* Oneshot services have disabled timeout by default */
if (s->type == SERVICE_ONESHOT && !s->timeout_defined)
s->timeout_usec = 0;
/* Oneshot services have disabled start timeout by default */
if (s->type == SERVICE_ONESHOT && !s->start_timeout_defined)
s->timeout_start_usec = 0;
service_fix_output(s);
@ -1603,11 +1608,10 @@ static int service_coldplug(Unit *u) {
s->deserialized_state == SERVICE_FINAL_SIGTERM ||
s->deserialized_state == SERVICE_FINAL_SIGKILL ||
s->deserialized_state == SERVICE_AUTO_RESTART) {
if (s->deserialized_state == SERVICE_AUTO_RESTART || s->timeout_usec > 0) {
if (s->deserialized_state == SERVICE_AUTO_RESTART || s->timeout_start_usec > 0) {
usec_t k;
k = s->deserialized_state == SERVICE_AUTO_RESTART ? s->restart_usec : s->timeout_usec;
k = s->deserialized_state == SERVICE_AUTO_RESTART ? s->restart_usec : s->timeout_start_usec;
if ((r = unit_watch_timer(UNIT(s), k, &s->timer_watch)) < 0)
return r;
@ -1753,8 +1757,9 @@ static int service_spawn(
}
}
if (timeout && s->timeout_usec) {
if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
if (timeout && s->timeout_start_usec) {
r = unit_watch_timer(UNIT(s), s->timeout_start_usec, &s->timer_watch);
if (r < 0)
goto fail;
} else
unit_unwatch_timer(UNIT(s), &s->timer_watch);
@ -2011,9 +2016,11 @@ static void service_enter_signal(Service *s, ServiceState state, ServiceResult f
}
if (wait_for_exit) {
if (s->timeout_usec > 0)
if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
if (s->timeout_stop_usec > 0) {
r = unit_watch_timer(UNIT(s), s->timeout_stop_usec, &s->timer_watch);
if (r < 0)
goto fail;
}
service_set_state(s, state);
} else if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL)

5
src/core/service.h
View File

@ -120,7 +120,8 @@ struct Service {
char *pid_file;
usec_t restart_usec;
usec_t timeout_usec;
usec_t timeout_start_usec;
usec_t timeout_stop_usec;
dual_timestamp watchdog_timestamp;
usec_t watchdog_usec;
@ -166,7 +167,7 @@ struct Service {
bool bus_name_good:1;
bool forbid_restart:1;
bool got_socket_fd:1;
bool timeout_defined:1;
bool start_timeout_defined:1;
#ifdef HAVE_SYSV_COMPAT
bool is_sysv:1;
bool sysv_has_lsb:1;