debian: add support for DEB_BUILD_OPTIONS=parallel=N

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

diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in
index 5bdbd11..fe4dda9 100644 (file)
--- a/scrub/e2scrub_all.in
+++ b/scrub/e2scrub_all.in
@@ -56,14 +56,8 @@ exitcode() {
        # section 22.2) and hope the admin will scan the log for what
        # actually happened.
 
-       # We have to sleep 2 seconds here because journald uses the pid to
-       # connect our log messages to the systemd service.  This is critical
-       # 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
 
        exit "${ret}"
@@ -80,15 +74,33 @@ while getopts "nrAV" opt; do
 done
 shift "$((OPTIND - 1))"
 
-if [ -n "${SERVICE_MODE}" -a "${reap}" -ne 1 -a "${periodic_e2scrub}" -ne 1 ]
-then
-    exitcode 0
+# If we're in service mode and the service is not enabled via config file...
+if [ -n "${SERVICE_MODE}" -a "${periodic_e2scrub}" -ne 1 ]; then
+       # ...don't start e2scrub processes.
+       if [ "${reap}" -eq 0 ]; then
+               exitcode 0
+       fi
+
+       # ...and if we don't see any leftover e2scrub snapshots, don't
+       # run the reaping process either, because lvs can be slow.
+       if ! readlink -q -s -e /dev/mapper/*.e2scrub* > /dev/null; then
+               exitcode 0
+       fi
 fi
 
+# close file descriptor 3 (from cron) since it causes lvm to kvetch
+exec 3<&-
+
 # If some prerequisite packages are not installed, exit with a code
 # indicating success to avoid spamming the sysadmin with fail messages
 # when e2scrub_all is run out of cron or a systemd timer.
 
+if ! type mapfile >& /dev/null ; then
+    test -n "${SERVICE_MODE}" && exitcode 0
+    echo "e2scrub_all: can't find mapfile --- is bash 4.xx installed?"
+    exitcode 1
+fi
+
 if ! type lsblk >& /dev/null ; then
     test -n "${SERVICE_MODE}" && exitcode 0
     echo "e2scrub_all: can't find lsblk --- is util-linux installed?"
@@ -103,7 +115,7 @@ fi
 
 # Find scrub targets, make sure we only do this once.
 ls_scan_targets() {
-    local devices=$(lvs -o lv_path --noheadings -S "lv_active=active,lv_role=public,lv_role!=snapshot,vg_free>${snap_size_mb}")
+    local devices=$(lvs -o lv_path --noheadings -S "lv_active=active,lv_role=public,lv_role!=snapshot,vg_free>=${snap_size_mb}")
 
     if [ -z "$devices" ]; then
        return 0;
@@ -113,6 +125,10 @@ ls_scan_targets() {
        while read vars ; do
                eval "${vars}"
 
+               # Skip unjournalled filesystems; they are inconsistent when
+               # mounted
+               dumpe2fs -h "${NAME}" | grep -q 'has_journal' || continue
+
                if [ "${scrub_all}" -eq 1 ] || [ -n "${MOUNTPOINT}" ]; then
                    echo ${MOUNTPOINT:-${NAME}}
                fi
@@ -134,32 +150,20 @@ ls_targets() {
        fi
 }
 
-# systemd doesn't know to do path escaping on the instance variable we pass
-# to the e2scrub service, which breaks things if there is a dash in the path
-# name.  Therefore, do the path escaping ourselves if needed.
-#
-# systemd path escaping also drops the initial slash so we add that back in so
-# that log messages from the service units preserve the full path and users can
-# look up log messages using full paths.  However, for "/" the escaping rules
-# do /not/ drop the initial slash, so we have to special-case that here.
+# Turn our mount path into a service name that systemd will recognize
 escape_path_for_systemd() {
        local path="$1"
-
-       if [ "${path}" != "/" ]; then
-               echo "-$(systemd-escape --path "${path}")"
-       else
-               echo "-"
-       fi
+       systemd-escape --template 'e2scrub@.service' --path "${path}"
 }
 
 # Scrub any mounted fs on lvm by creating a snapshot and fscking that.
-stdin="$(realpath /dev/stdin)"
-ls_targets | while read tgt; do
+mapfile -t targets < <(ls_targets)
+for tgt in "${targets[@]}"; do
        # If we're not reaping and systemd is present, try invoking the
        # systemd service.
        if [ "${reap}" -ne 1 ] && type systemctl > /dev/null 2>&1; then
-               tgt_esc="$(escape_path_for_systemd "${tgt}")"
-               ${DBG} systemctl start "e2scrub@${tgt_esc}" 2> /dev/null < "${stdin}"
+               svcname="$(escape_path_for_systemd "${tgt}")"
+               ${DBG} systemctl start "${svcname}" 2> /dev/null
                res=$?
                if [ "${res}" -eq 0 ] || [ "${res}" -eq 1 ]; then
                        continue;
@@ -167,7 +171,7 @@ ls_targets | while read tgt; do
        fi
 
        # Otherwise use direct invocation
-       ${DBG} "@root_sbindir@/e2scrub" ${scrub_args} "${tgt}" < "${stdin}"
+       ${DBG} "@root_sbindir@/e2scrub" ${scrub_args} "${tgt}"
 done
 
 exitcode 0