diff options
| -rw-r--r-- | etc/systemd/system/zfs-import-cache.service.in | 2 | ||||
| -rw-r--r-- | etc/systemd/system/zfs-import-scan.service.in | 2 | ||||
| -rw-r--r-- | lib/libzfs/libzfs_util.c | 69 |
3 files changed, 67 insertions, 6 deletions
diff --git a/etc/systemd/system/zfs-import-cache.service.in b/etc/systemd/system/zfs-import-cache.service.in index 17d90f638..b9cca2b29 100644 --- a/etc/systemd/system/zfs-import-cache.service.in +++ b/etc/systemd/system/zfs-import-cache.service.in @@ -9,4 +9,4 @@ ConditionPathExists=@sysconfdir@/zfs/zpool.cache [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN +ExecStart=/sbin/modprobe zfs && @sbindir@/zpool import -c @sysconfdir@/zfs/zpool.cache -aN diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in index a93721156..1e7e1e473 100644 --- a/etc/systemd/system/zfs-import-scan.service.in +++ b/etc/systemd/system/zfs-import-scan.service.in @@ -9,4 +9,4 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache [Service] Type=oneshot RemainAfterExit=yes -ExecStart=@sbindir@/zpool import -d /dev/disk/by-id -aN +ExecStart=/sbin/modprobe zfs && @sbindir@/zpool import -d /dev/disk/by-id -aN diff --git a/lib/libzfs/libzfs_util.c b/lib/libzfs/libzfs_util.c index d340fa49d..9d68756be 100644 --- a/lib/libzfs/libzfs_util.c +++ b/lib/libzfs/libzfs_util.c @@ -661,23 +661,84 @@ libzfs_run_process(const char *path, char *argv[], int flags) return (-1); } +/* + * Verify the required ZFS_DEV device is available and optionally attempt + * to load the ZFS modules. Under normal circumstances the modules + * should already have been loaded by some external mechanism. + * + * Environment variables: + * - ZFS_MODULE_LOADING="YES|yes|ON|on" - Attempt to load modules. + * - ZFS_MODULE_TIMEOUT="<seconds>" - Seconds to wait for ZFS_DEV + */ int libzfs_load_module(const char *module) { char *argv[4] = {"/sbin/modprobe", "-q", (char *)module, (char *)0}; + char *load_str, *timeout_str; + long timeout = 10; /* seconds */ + long busy_timeout = 10; /* milliseconds */ + int load = 0, fd; + hrtime_t start; + + /* Optionally request module loading */ + if (!libzfs_module_loaded(module)) { + load_str = getenv("ZFS_MODULE_LOADING"); + if (load_str) { + if (!strncasecmp(load_str, "YES", strlen("YES")) || + !strncasecmp(load_str, "ON", strlen("ON"))) + load = 1; + else + load = 0; + } - if (libzfs_module_loaded(module)) - return (0); + if (load && libzfs_run_process("/sbin/modprobe", argv, 0)) + return (ENOEXEC); + } + + /* Module loading is synchronous it must be available */ + if (!libzfs_module_loaded(module)) + return (ENXIO); + + /* + * Device creation by udev is asynchronous and waiting may be + * required. Busy wait for 10ms and then fall back to polling every + * 10ms for the allowed timeout (default 10s, max 10m). This is + * done to optimize for the common case where the device is + * immediately available and to avoid penalizing the possible + * case where udev is slow or unable to create the device. + */ + timeout_str = getenv("ZFS_MODULE_TIMEOUT"); + if (timeout_str) { + timeout = strtol(timeout_str, NULL, 0); + timeout = MAX(MIN(timeout, (10 * 60)), 0); /* 0 <= N <= 600 */ + } + + start = gethrtime(); + do { + fd = open(ZFS_DEV, O_RDWR); + if (fd >= 0) { + (void) close(fd); + return (0); + } else if (errno != ENOENT) { + return (errno); + } else if (NSEC2MSEC(gethrtime() - start) < busy_timeout) { + sched_yield(); + } else { + usleep(10 * MILLISEC); + } + } while (NSEC2MSEC(gethrtime() - start) < (timeout * MILLISEC)); - return (libzfs_run_process("/sbin/modprobe", argv, 0)); + return (ENOENT); } libzfs_handle_t * libzfs_init(void) { libzfs_handle_t *hdl; + int error; - if (libzfs_load_module("zfs") != 0) { + error = libzfs_load_module(ZFS_DRIVER); + if (error) { (void) fprintf(stderr, gettext("Failed to load ZFS module " "stack.\nLoad the module manually by running " "'insmod <location>/zfs.ko' as root.\n")); |