Ensure all block devices are available

These days most disk drivers will probe for devices asynchronously.
This means it's possible that when you zfs init script runs all the
required block devices may not yet have been discovered.  The result
is the pool may fail to cleanly import at boot time.  This is
particularly common when you have a large number of devices.

The fix is for the init script to block until udev settles and we
are no longer detecting new devices.  Once the system has settled
the zfs modules can be loaded and the pool with be automatically
imported.

diff --git a/etc/init.d/zfs.fedora b/etc/init.d/zfs.fedora
index 69df621e30bf3923cf621d4b34e92d342c2e4b7c..bfed452ad694884b72d63ea6b0d9087570195b9b 100644 (file)
--- a/etc/init.d/zfs.fedora
+++ b/etc/init.d/zfs.fedora
@@ -126,6 +126,9 @@ start()
                 action $"SELinux ZFS policy required: " /bin/false || return 6
         fi
 
+       # Delay until all required block devices are present.
+       udevadm settle
+
        # load kernel module infrastructure
        if ! grep -q zfs /proc/modules ; then
                action $"Loading kernel ZFS infrastructure: " modprobe zfs || return 5

diff --git a/etc/init.d/zfs.gentoo b/etc/init.d/zfs.gentoo
index c9c5d8502c9ba4e768068d75a316e8fc13aa5d6f..a33d9dc29a2eced25ea35d7183b1e95ea2fa058c 100644 (file)
--- a/etc/init.d/zfs.gentoo
+++ b/etc/init.d/zfs.gentoo
@@ -41,6 +41,10 @@ checksystem() {
 start() {
        ebegin "Starting ZFS"
        checksystem || return 1
+
+       # Delay until all required block devices are present.
+       udevadm settle
+
        if [ ! -c /dev/zfs ]; then
                modprobe $ZFS_MODULE
                rv=$?

diff --git a/etc/init.d/zfs.lsb b/etc/init.d/zfs.lsb
index a84c1df239207260ef0aa8a30affa151861ad442..6c0a743cc08abaa6236e67d69c2206c84c81d71b 100644 (file)
--- a/etc/init.d/zfs.lsb
+++ b/etc/init.d/zfs.lsb
@@ -50,6 +50,9 @@ start()
                return 4
        fi
 
+       # Delay until all required block devices are present.
+       udevadm settle
+
        # Load the zfs module stack
        /sbin/modprobe zfs
 

diff --git a/etc/init.d/zfs.lunar b/etc/init.d/zfs.lunar
index c7aa1edb46e3fa2115f0aa3e0dc60e0dfe3ce731..4512151c2b664dd56aea176cee0596c08b4d8595 100644 (file)
--- a/etc/init.d/zfs.lunar
+++ b/etc/init.d/zfs.lunar
@@ -13,6 +13,9 @@
 case $1 in
   start)  echo "$1ing ZFS filesystems"
 
+    # Delay until all required block devices are present.
+    udevadm settle
+
     if ! grep "zfs" /proc/modules > /dev/null; then
       echo "ZFS kernel module not loaded yet; loading...";
       if ! modprobe zfs; then

diff --git a/etc/init.d/zfs.redhat b/etc/init.d/zfs.redhat
index 99ff80e929f241dbcc51ad45507c60e03f35289c..3f34f2febb145bbbf2fe1ba939132c602e8ca156 100644 (file)
--- a/etc/init.d/zfs.redhat
+++ b/etc/init.d/zfs.redhat
@@ -76,6 +76,9 @@ start()
                 action $"SELinux ZFS policy required: " /bin/false || return 6
         fi
 
+       # Delay until all required block devices are present.
+       udevadm settle
+
        # load kernel module infrastructure
        if ! grep -q zfs /proc/modules ; then
                action $"Loading kernel ZFS infrastructure: " modprobe zfs || return 5