Backup: Add daft_sleep calls to snapshot code.

Nowadays udev (and other things) tend to randomly open new block
devices, and cause other kinds of trouble.  Bodge around this by
adding some sleeps.

Empirically tested on old-zealot.

diff --git a/backup/snap-common b/backup/snap-common
index 1806a71b3512720d00db6639559dbf35c0e2a2b6..99234b159737be9fed1a80fdb5aa727e43559af4 100644 (file)
--- a/backup/snap-common
+++ b/backup/snap-common
@@ -50,10 +50,17 @@ lvmdevice2vgroup () {
        vgroup="${vgroup%/*}"
 }
 
+daft_sleep () {
+       sleep 5
+}
+
 lvmdropcore () {
        snmnt="$vardir/snap-mount"
+       daft_sleep
        umount -v "$snmnt" || true
+       daft_sleep
        test ! -d "$snmnt" || rmdir -- "$snmnt" || rm -f "$snmnt"
+       daft_sleep
 
        set +e
        old_lv_dev="$(readlink $vardir/snap-device)"
@@ -62,7 +69,9 @@ lvmdropcore () {
 
        if [ $rc = 0 ]; then
                set +e
+               daft_sleep
                lvremove -f $lvm_lvtools_opts      $old_lv_dev
+               daft_sleep
                set -e
                rm $vardir/snap-device
        fi

diff --git a/debian/changelog b/debian/changelog
index 64fc9188ba4195a9885344362b46f17390e4b10d..28e0bc9cc6b89b37e41185e5247e64ce0e9376a5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ chiark-utils (4.5.0~iwj4) unstable; urgency=medium
 
   * Add debian/.debhelper to .gitignore.
   * Backup: No longer attempt to lvchange -a n the snapshot volume.
+  * Backup: Add daft_sleep calls to snapshot code.
 
  --