e2scrub_all: refactor device probe loop
PATCH 1/1 e2scrub_all: refactor device probe loop
From: Darrick J. Wong <[email protected]>
Paul Menzel reported that the e2scrub_all reaper service that runs at startup takes a long time to run, and Ted T'so pointed out that we could do a lot less work by using lvs as the outer loop in the ext4 filesystem probe function so that we only have to lsblk the lvm devices containing ext4 filesystems.
Therefore, refactor the loops to put lvs first, which should boost speed a bit.
--- scrub/e2scrub_all.in | 51 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-)
scrub/e2scrub_all.in +37 -14
@@ -19,6 +19,7 @@ # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. scrub_all=0 +reap=0 conffile="@root_sysconfdir@/e2scrub.conf" test -f "${conffile}" && . "${conffile}"
@@ -61,7 +62,7 @@ exitcode() { while getopts "ArV" opt; do case "${opt}" in "A") scrub_all=1;; - "r") scrub_args="${scrub_args} -r";; + "r") scrub_args="${scrub_args} -r"; reap=1;; "V") print_version; exitcode 0;; *) print_help; exitcode 2;; esac
@@ -69,27 +70,27 @@ done shift "$((OPTIND - 1))" # Find scrub targets, make sure we only do this once. -ls_scrub_targets() { - lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n | while read vars; do +ls_scan_targets() { + lvs --name-prefixes -o vg_name,lv_name,lv_path \ + -S lv_active=active,lv_role=public --noheadings | \ + while read vars; do eval "${vars}" + eval "$(lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n "${LVM2_LV_PATH}")" - # Skip non-ext[234] + # Skip unless ext* case "${FSTYPE}" in - ext[234]) ;; - *) continue;; + ext*) ;; + *) continue;; esac + # Don't run against a snapshot ever + echo "${LVM2_LV_ROLE}" | grep -q "snapshot" && continue + # Skip unmounted filesystems unless -A if [ "${scrub_all}" -eq 0 ] && [ -z "${MOUNTPOINT}" ]; then continue; fi - # Skip non-lvm devices and lvm snapshots - lvm_vars="$(lvs --nameprefixes -o vg_name,lv_name,lv_role --noheadings "${NAME}" 2> /dev/null)" - test $? -ne 0 && continue - eval "${lvm_vars}" - echo "${LVM2_LV_ROLE}" | grep -q "snapshot" && continue - if [ -n "${MOUNTPOINT}" ]; then echo "${MOUNTPOINT}" else
@@ -98,6 +99,28 @@ ls_scrub_targets() { done | sort | uniq } +# Find leftover scrub snapshots +ls_reap_targets() { + lvs --name-prefixes -o vg_name,lv_name,lv_path,origin \ + -S lv_role=snapshot --noheadings | while read vars; do + eval "${vars}" + + # Filter out anything except our snapshots + case "${LVM2_LV_NAME}" in + *.e2scrub) echo "${LVM2_LV_PATH}";; + esac + done | sort | uniq +} + +# Figure out what we're targeting +ls_targets() { + if [ "${reap}" -eq 1 ]; then + ls_reap_targets + else + ls_scan_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.
@@ -118,10 +141,10 @@ escape_path_for_systemd() { # Scrub any mounted fs on lvm by creating a snapshot and fscking that. stdin="$(realpath /dev/stdin)" -ls_scrub_targets | while read tgt; do +ls_targets | while read tgt; do # If we're not reaping and systemd is present, try invoking the # systemd service. - if [ -z "${scrub_args}" ] && type systemctl > /dev/null 2>&1; then + 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}" res=$?
Quoted 39 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Paul Menzel reported that the
e2scrub_allreaper service that runs at startup takes a long time to run, and Ted T'so pointed out that we could do a lot less work by using lvs as the outer loop in the ext4 filesystem probe function so that we only have to lsblk the lvm devices containing ext4 filesystems.Therefore, refactor the loops to put lvs first, which should boost speed a bit.
Reported-by Paul Menzel <[email protected]>Signed-off-by Darrick J. Wong <[email protected]>--- scrub/e2scrub_all.in | 51 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 14 deletions(-)scrub/e2scrub_all.in +2
-1@@ -19,6 +19,7 @@ # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. scrub_all=0 +reap=0 conffile="@root_sysconfdir@/e2scrub.conf" test -f "${conffile}" && . "${conffile}"@@ -61,7 +62,7 @@ exitcode() { while getopts "ArV" opt; do case "${opt}" in "A") scrub_all=1;; - "r") scrub_args="${scrub_args} -r";; + "r") scrub_args="${scrub_args} -r"; reap=1;; "V") print_version; exitcode 0;; *) print_help; exitcode 2;; esac
scrub/e2scrub_all.in done · line 75
Quoted 8 lines
scrub/e2scrub_all.in +3
-2@@ -69,27 +70,27 @@ done shift "$((OPTIND - 1))" # Find scrub targets, make sure we only do this once. -ls_scrub_targets() { - lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n | while read vars; do +ls_scan_targets() { + lvs --name-prefixes -o vg_name,lv_name,lv_path \ + -S lv_active=active,lv_role=public --noheadings | \
You're not using vg_name, nor lv_name so you can drop it maybe ? Also you're missing lv_role since you're checking it later, however you can do this instead
-S lv_active=active,lv_role=public -S lv_role!=snapshot
so you only need to ask for lv_path
scrub/e2scrub_all.in done · line 78
Quoted 3 lines
scrub/e2scrub_all.in +2
-0+ while read vars; do eval "${vars}" + eval "$(lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n "${LVM2_LV_PATH}")"
Now that you only have one lv filed you can maybe pass this directly to the lsblk ?
This looks funny but works fine for me :)
lsblk -o MOUNTPOINT,NAME,FSTYPE -p -n lvs -o lv_path -S lv_active=active,lv_role=public -S lv_role!=snapshot --noheadings | grep 'ext[234]' | awk '{print $1}'
if you only want mounted file systems than you just add
| grep -v -E '^/dev/'
Quoted 28 lines
scrub/e2scrub_all.in +6
-9- # Skip non-ext[234] + # Skip unless ext* case "${FSTYPE}" in - ext[234]) ;; - *) continue;; + ext*) ;; + *) continue;; esac + # Don't run against a snapshot ever + echo "${LVM2_LV_ROLE}" | grep -q "snapshot" && continue + # Skip unmounted filesystems unless -A if [ "${scrub_all}" -eq 0 ] && [ -z "${MOUNTPOINT}" ]; then continue; fi - # Skip non-lvm devices and lvm snapshots - lvm_vars="$(lvs --nameprefixes -o vg_name,lv_name,lv_role --noheadings "${NAME}" 2> /dev/null)" - test $? -ne 0 && continue - eval "${lvm_vars}" - echo "${LVM2_LV_ROLE}" | grep -q "snapshot" && continue - if [ -n "${MOUNTPOINT}" ]; then echo "${MOUNTPOINT}" else
scrub/e2scrub_all.in ls_scrub_targets() { · line 104
Quoted 6 lines
scrub/e2scrub_all.in +3
-0@@ -98,6 +99,28 @@ ls_scrub_targets() { done | sort | uniq } +# Find leftover scrub snapshots +ls_reap_targets() { + lvs --name-prefixes -o vg_name,lv_name,lv_path,origin \
You only seem to be using lv_name and lv_path ?
also I think you can do this:
lvs -o lv_path -S lv_role=snapshot -S lv_name=~\(e2scrub$\) --noheadings
Also since you only ask for one field I tihnk it's already sorted so no need to sort, or add -O
-Lukas
Quoted 35 lines
scrub/e2scrub_all.in +21
-2+ -S lv_role=snapshot --noheadings | while read vars; do + eval "${vars}" + + # Filter out anything except our snapshots + case "${LVM2_LV_NAME}" in + *.e2scrub) echo "${LVM2_LV_PATH}";; + esac + done | sort | uniq +} + +# Figure out what we're targeting +ls_targets() { + if [ "${reap}" -eq 1 ]; then + ls_reap_targets + else + ls_scan_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.@@ -118,10 +141,10 @@ escape_path_for_systemd() { # Scrub any mounted fs on lvm by creating a snapshot and fscking that. stdin="$(realpath /dev/stdin)" -ls_scrub_targets | while read tgt; do +ls_targets | while read tgt; do # If we're not reaping and systemd is present, try invoking the # systemd service. - if [ -z "${scrub_args}" ] && type systemctl > /dev/null 2>&1; then + 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}" res=$?
Quoted 11 lines · Lukas Czerner
scrub/e2scrub_all.in done · line 75
Quoted 6 lines
# Find scrub targets, make sure we only do this once.
scrub/e2scrub_all.in +3
-2-ls_scrub_targets() { - lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n | while read vars; do +ls_scan_targets() { + lvs --name-prefixes -o vg_name,lv_name,lv_path \ + -S lv_active=active,lv_role=public --noheadings | \You're not using
vg_name, norlv_nameso you can drop it maybe ? Also you're missinglv_rolesince you're checking it later, however you can do this instead
Quoted 1 line
-S lv_active=active,lv_role=public -S lv_role!=snapshot
We don't need to check lv_role at all, since the command already included:
-S lv_active=active,lv_role=public
And we need to do lv_role=public and not lv_role!=snapshot, since we need to also exclude thinpools.
Speaking of thinpools, although we *can* take a thick snapshot of a thinp volume, in the future we might want to add support for taking a thinp snapshot. (Although that will make the check which I've been working on to make sure there's enough free space a bit more complicated.)
I have some other patches queued for e2scrub, so I'll take a whack and trying to make a reivison of this patch, and then send out a stack of patches against e2scrub for folks to look at.
- Ted
Quoted 12 lines · Theodore Ts'o
Quoted 11 lines · Lukas Czerner
scrub/e2scrub_all.in done · line 75
Quoted 6 lines
# Find scrub targets, make sure we only do this once.
scrub/e2scrub_all.in +3
-2-ls_scrub_targets() { - lsblk -o NAME,FSTYPE,MOUNTPOINT -p -P -n | while read vars; do +ls_scan_targets() { + lvs --name-prefixes -o vg_name,lv_name,lv_path \ + -S lv_active=active,lv_role=public --noheadings | \You're not using
vg_name, norlv_nameso you can drop it maybe ? Also you're missinglv_rolesince you're checking it later, however you can do this instead
Quoted 6 lines
Quoted 1 line
-S lv_active=active,lv_role=public -S lv_role!=snapshotWe don't need to check
lv_roleat all, since the command already included:-S lv_active=active,lv_role=public
You actually need to check the lv_role for snapshot, because snapshot can be "public" as well.
Quoted 3 lines
And we need to do lv_role=public and not lv_role!=snapshot, since we need to also exclude thinpools.
No, you need to check both if you want to exclude snapshots.
I think that specifying -S twice tricked you, sorry about that. But again you can do:
-S lv_active=active,lv_role=public,lv_role!=snapshot
Thanks!
-Lukas