dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20713 from yuwata/udev-watch-retry

Browse Source 
udev-watch: retry to save watch handle on error
This commit is contained in:
Lennart Poettering
2021-09-14 09:40:23 +02:00
committed by GitHub
parent 8be102f8b8 2d3af41f0e
commit b83bbbac87
2 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libsystemd/sd-device/device-private.c
View File

@@ -680,7 +680,7 @@ int device_set_watch_handle(sd_device *device, int wd) {
assert(device);
if (wd >= 0 && wd == device->watch_handle)
if (wd >= 0 && wd == device_get_watch_handle(device))
return 0;
device_remove_watch_handle(device);

45
src/udev/udev-watch.c
View File

@@ -12,8 +12,13 @@
#include "dirent-util.h"
#include "fs-util.h"
#include "parse-util.h"
#include "random-util.h"
#include "udev-watch.h"
#define SAVE_WATCH_HANDLE_MAX_RETRIES 128
#define MAX_RANDOM_DELAY (100 * USEC_PER_MSEC)
#define MIN_RANDOM_DELAY ( 10 * USEC_PER_MSEC)
int udev_watch_restore(int inotify_fd) {
struct dirent *ent;
DIR *dir;
@@ -93,11 +98,43 @@ int udev_watch_begin(int inotify_fd, sd_device *dev) {
return ignore ? 0 : r;
}
r = device_set_watch_handle(dev, wd);
if (r < 0)
return log_device_warning_errno(dev, r, "Failed to save watch handle in /run/udev/watch: %m");
for (unsigned i = 0; i < SAVE_WATCH_HANDLE_MAX_RETRIES; i++) {
if (i > 0) {
usec_t delay = MIN_RANDOM_DELAY + random_u64_range(MAX_RANDOM_DELAY - MIN_RANDOM_DELAY);
return 0;
/* When the same handle is reused for different device node, we may fail to
* save the watch handle with -EEXIST. Let's consider the case of two workers A
* and B do the following:
*
* 1. A calls inotify_rm_watch()
* 2. B calls inotify_add_watch()
* 3. B calls device_set_watch_handle()
* 4. A calls device_set_watch_handle(-1)
*
* At step 3, the old symlinks to save the watch handle still exist. So,
* device_set_watch_handle() fails with -EEXIST. */
log_device_debug_errno(dev, r,
"Failed to save watch handle '%i' for %s in "
"/run/udev/watch, retrying in after %s: %m",
wd, devnode, FORMAT_TIMESPAN(delay, USEC_PER_MSEC));
(void) usleep(delay);
}
r = device_set_watch_handle(dev, wd);
if (r >= 0)
return 0;
if (r != -EEXIST)
break;
}
log_device_warning_errno(dev, r,
"Failed to save watch handle '%i' for %s in /run/udev/watch: %m",
wd, devnode);
(void) inotify_rm_watch(inotify_fd, wd);
return r;
}
int udev_watch_end(int inotify_fd, sd_device *dev) {