Permalink
Browse files

udevd: add --event-timeout commandline option

Some events take longer than the default 30 seconds. Killing those
events will leave the machine halfway configured.

Add a commandline option '--event-timeout' to handle these cases.
  • Loading branch information...
hreinecke authored and kaysievers committed Jul 29, 2014
1 parent 32767cb commit 9719859c07aa13539ed2cd4b31972cd30f678543
Showing with 30 additions and 1 deletion.
  1. +19 −0 man/systemd-udevd.service.xml
  2. +11 −1 src/udev/udevd.c
@@ -44,6 +44,7 @@
<arg><option>--debug</option></arg>
<arg><option>--children-max=</option></arg>
<arg><option>--exec-delay=</option></arg>
<arg><option>--event-timeout=</option></arg>
<arg><option>--resolve-names=early|late|never</option></arg>
<arg><option>--version</option></arg>
<arg><option>--help</option></arg>
@@ -95,6 +96,15 @@
</listitem>
</varlistentry>

<varlistentry>
<term><option>--event-timeout=</option></term>
<listitem>
<para>Wait for the event to finish up to the given
number of seconds. After this time the event will
be terminated. Default is 30.</para>
</listitem>
</varlistentry>

<varlistentry>
<term><option>--resolve-names=</option></term>
<listitem>
@@ -155,6 +165,15 @@
non-working kernel modules.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>udev.event-timeout=</varname></term>
<term><varname>rd.udev.event-timeout=</varname></term>
<listitem>
<para>Wait for events to finish up to the given number
of seconds. This option might be useful if events are
terminated due to a timeout in large configurations.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>net.ifnames=</varname></term>
<listitem>
@@ -74,6 +74,7 @@ static bool reload;
static int children;
static int children_max;
static int exec_delay;
static int event_timeout = 30;
static sigset_t sigmask_orig;
static UDEV_LIST(event_list);
static UDEV_LIST(worker_list);
@@ -312,6 +313,9 @@ static void worker_new(struct event *event)
}
}

if (event_timeout != 30)
udev_event->timeout_usec = event_timeout * USEC_PER_SEC;

/* apply rules, create node, symlinks */
udev_event_execute_rules(udev_event, rules, &sigmask_orig);

@@ -1009,6 +1013,8 @@ static void kernel_cmdline_options(struct udev *udev)
children_max = strtoul(opt + 18, NULL, 0);
} else if (startswith(opt, "udev.exec-delay=")) {
exec_delay = strtoul(opt + 16, NULL, 0);
} else if (startswith(opt, "udev.event-timeout=")) {
event_timeout = strtoul(opt + 16, NULL, 0);
}

free(s);
@@ -1026,6 +1032,7 @@ int main(int argc, char *argv[])
{ "debug", no_argument, NULL, 'D' },
{ "children-max", required_argument, NULL, 'c' },
{ "exec-delay", required_argument, NULL, 'e' },
{ "event-timeout", required_argument, NULL, 't' },
{ "resolve-names", required_argument, NULL, 'N' },
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, 'V' },
@@ -1069,6 +1076,9 @@ int main(int argc, char *argv[])
case 'e':
exec_delay = strtoul(optarg, NULL, 0);
break;
case 't':
event_timeout = strtoul(optarg, NULL, 0);
break;
case 'D':
debug = true;
log_set_max_level(LOG_DEBUG);
@@ -1406,7 +1416,7 @@ int main(int argc, char *argv[])
if (worker->state != WORKER_RUNNING)
continue;

if ((now(CLOCK_MONOTONIC) - worker->event_start_usec) > 30 * USEC_PER_SEC) {
if ((now(CLOCK_MONOTONIC) - worker->event_start_usec) > event_timeout * USEC_PER_SEC) {
log_error("worker [%u] %s timeout; kill it", worker->pid,
worker->event ? worker->event->devpath : "<idle>");
kill(worker->pid, SIGKILL);

0 comments on commit 9719859

Please sign in to comment.