e2scrub, e2scrub_all: don't sleep unnecessarily in exitcode

[tools/e2fsprogs.git] / scrub / e2scrub.in

diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in
index b660e56..30ab7cb 100644 (file)
--- a/scrub/e2scrub.in
+++ b/scrub/e2scrub.in
@@ -66,7 +66,7 @@ exitcode() {
        # for capturing all the log messages if the scrub fails, because the
        # fail service uses the service name to gather log messages for the
        # error report.
-       if [ -n "${SERVICE_MODE}" ]; then
+       if [ -n "${SERVICE_MODE}" -a "${ret}" -ne 0 ]; then
                test "${ret}" -ne 0 && ret=1
                sleep 2
        fi
@@ -101,6 +101,9 @@ if ! type lvcreate >& /dev/null ; then
     exitcode 1
 fi
 
+# close file descriptor 3 (from cron) since it causes lvm to kvetch
+exec 3<&-
+
 # Find the device for a given mountpoint
 dev_from_mount() {
        local mountpt="$(realpath "$1")"
@@ -171,10 +174,10 @@ snap_dev="/dev/${LVM2_VG_NAME}/${snap}"
 
 teardown() {
        # Remove and wait for removal to succeed.
-       ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}" 3>&-
+       ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}"
        while [ -e "${snap_dev}" ] && [ "$?" -eq "5" ]; do
                sleep 0.5
-               ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}" 3>&-
+               ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}"
        done
 }
 
@@ -198,19 +201,19 @@ mark_corrupt() {
 
 setup() {
        # Try to remove snapshot for 30s, bail out if we can't remove it.
-       lveremove_deadline="$(( $(date "+%s") + 30))"
-       ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}" 3>&- 2>/dev/null
+       lvremove_deadline="$(( $(date "+%s") + 30))"
+       ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}" 2>/dev/null
        while [ -e "${snap_dev}" ] && [ "$?" -eq "5" ] &&
              [ "$(date "+%s")" -lt "${lvremove_deadline}" ]; do
                sleep 0.5
-               ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}" 3>&-
+               ${DBG} lvremove -f "${LVM2_VG_NAME}/${snap}"
        done
        if [ -e "${snap_dev}" ]; then
                echo "${arg}: e2scrub snapshot is in use, cannot check!"
                return 1
        fi
        # Create the snapshot, wait for device to appear.
-       ${DBG} lvcreate -s -L "${snap_size_mb}m" -n "${snap}" "${LVM2_VG_NAME}/${LVM2_LV_NAME}" 3>&-
+       ${DBG} lvcreate -s -L "${snap_size_mb}m" -n "${snap}" "${LVM2_VG_NAME}/${LVM2_LV_NAME}"
        if [ $? -ne 0 ]; then
                echo "${arg}: e2scrub snapshot FAILED, will not check!"
                return 1