From 9719859c07aa13539ed2cd4b31972cd30f678543 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Tue, 29 Jul 2014 09:06:14 +0200 Subject: [PATCH] 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. --- man/systemd-udevd.service.xml | 19 +++++++++++++++++++ src/udev/udevd.c | 12 +++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git man/systemd-udevd.service.xml man/systemd-udevd.service.xml index f44b7a0..8de43b1 100644 --- man/systemd-udevd.service.xml +++ man/systemd-udevd.service.xml @@ -44,6 +44,7 @@ + @@ -96,6 +97,15 @@ + + + Wait for the event to finish up to the given + number of seconds. After this time the event will + be terminated. Default is 30. + + + + Specify when systemd-udevd should resolve names of users and groups. @@ -156,6 +166,15 @@ + udev.event-timeout= + rd.udev.event-timeout= + + 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. + + + net.ifnames= Network interfaces are renamed to give them predictable names diff --git src/udev/udevd.c src/udev/udevd.c index db935d6..c5dd739 100644 --- src/udev/udevd.c +++ src/udev/udevd.c @@ -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 : ""); kill(worker->pid, SIGKILL); -- 1.7.9.2