On Wed, Mar 20, 2019 at 10:02:17PM -0400, Theodore Ts'o wrote:
> From: "Darrick J. Wong" <darrick.wong@xxxxxxxxxx>
>
> Paul Menzel reported that the e2scrub_all reaper service that runs at
> startup takes a long time to run, and Ted Ts'o 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.
>
> [ Made some of the further optimizations suggested by Lukas Czerner. -- TYT ]
>
> Reported-by: Paul Menzel <pmenzel@xxxxxxxxxxxxx>
> Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
> Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
> ---
> scrub/e2scrub_all.in | 34 +++++++++++++++++++++++-----------
> 1 file changed, 23 insertions(+), 11 deletions(-)
>
> diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in
> index 4cb90a0de..cad232987 100644
> --- a/scrub/e2scrub_all.in
> +++ b/scrub/e2scrub_all.in
> @@ -22,6 +22,7 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
>
> scrub_all=0
> snap_size_mb=256
> +reap=0
> conffile="@root_sysconfdir@/e2scrub.conf"
>
> test -f "${conffile}" && . "${conffile}"
> @@ -65,7 +66,7 @@ exitcode() {
> while getopts "nrAV" opt; do
> case "${opt}" in
> "n") DBG="echo Would execute: " ;;
> - "r") scrub_args="${scrub_args} -r";;
> + "r") scrub_args="${scrub_args} -r"; reap=1;;
> "A") scrub_all=1;;
> "V") print_version; exitcode 0;;
> *) print_help; exitcode 2;;
> @@ -88,9 +89,12 @@ if ! type lvcreate >& /dev/null ; then
> fi
>
> # 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_path \
> + -S lv_active=active,lv_role=public --noheadings | \
> + while read vars; do
> eval "${vars}"
> + eval "$(lsblk -o FSTYPE,MOUNTPOINT -p -P -n "${LVM2_LV_PATH}")"
Btw, I know that you're going to change and resend this, but there is
another problem. You're missing NAME field and so the check that we have
later
93 → → if [ -n "${MOUNTPOINT}" ]; then
94 → → → echo "${MOUNTPOINT}"
95 → → else
96 → → → echo "${NAME}"
97 → → fi
will never print the device name.
It almost feels like we need some regression testing for this ;) However
I agree that it's going to be PITA to create since historically our test
suite did not require elevated privledges, nor did it change the system
in any way.
I could bring some knowledge over from ssm and try to avoid system
changes by using loop devices and DM_DEV_DIR, but it will still require
a root privledges and will be significantly different from what we do in
tests/ today. Any ideas on how you want to do this ?
-Lukas
>
> # Skip non-ext[234]
> case "${FSTYPE}" in
> @@ -103,12 +107,6 @@ ls_scrub_targets() {
> 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
> -
> free_space="$(vgs -o vg_free --units m --noheadings --no-suffix "${LVM2_VG_NAME}" 2> /dev/null | sed -e 's/\..*//')"
> test "${snap_size_mb}" -gt "${free_space}" && continue
>
> @@ -120,6 +118,20 @@ ls_scrub_targets() {
> done | sort | uniq
> }
>
> +# Find leftover scrub snapshots
> +ls_reap_targets() {
> + lvs -o lv_path -S lv_role=snapshot -S lv_name=~\(e2scrub$\) --noheadings
> +}
> +
> +# 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.
> @@ -140,10 +152,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=$?
> --
> 2.19.1
>
