LU-8066 lfsck: use underscores in lfsck status files

Use underscores to separate words in the lfsck_layout
and oi_scrub files instead of hyphens, to match the use
in lfsck_namespace and consistency with other files.

Test-Parameters: trivial testlist=sanity-lfsck,sanity-scrub
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I5306d82a4e6056a5098d1753f53cb4ee4e2540e5
Reviewed-on: https://review.whamcloud.com/36715
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Olaf Faaland-LLNL <faaland1@llnl.gov>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/lfsck/lfsck_layout.c b/lustre/lfsck/lfsck_layout.c
index 6a1a5b0..a2b3a40 100644 (file)
--- a/lustre/lfsck/lfsck_layout.c
+++ b/lustre/lfsck/lfsck_layout.c
@@ -6046,8 +6046,8 @@ static void lfsck_layout_dump(const struct lu_env *env,
                           "run_time_phase2: %lld seconds\n"
                           "average_speed_phase1: %llu items/sec\n"
                           "average_speed_phase2: N/A\n"
                           "run_time_phase2: %lld seconds\n"
                           "average_speed_phase1: %llu items/sec\n"
                           "average_speed_phase2: N/A\n"

-                          "real-time_speed_phase1: %llu items/sec\n"
-                          "real-time_speed_phase2: N/A\n",
+                          "real_time_speed_phase1: %llu items/sec\n"
+                          "real_time_speed_phase2: N/A\n",

                           checked,
                           lo->ll_objs_checked_phase2,
                           rtime,
                           checked,
                           lo->ll_objs_checked_phase2,
                           rtime,


@@ -6093,8 +6093,8 @@ static void lfsck_layout_dump(const struct lu_env *env,
                           "run_time_phase2: %lld seconds\n"
                           "average_speed_phase1: %llu items/sec\n"
                           "average_speed_phase2: %llu items/sec\n"
                           "run_time_phase2: %lld seconds\n"
                           "average_speed_phase1: %llu items/sec\n"
                           "average_speed_phase2: %llu items/sec\n"

-                          "real-time_speed_phase1: N/A\n"
-                          "real-time_speed_phase2: %llu items/sec\n"
+                          "real_time_speed_phase1: N/A\n"
+                          "real_time_speed_phase2: %llu items/sec\n"

                           "current_position: "DFID"\n",
                           lo->ll_objs_checked_phase1,
                           checked,
                           "current_position: "DFID"\n",
                           lo->ll_objs_checked_phase1,
                           checked,


@@ -6118,8 +6118,8 @@ static void lfsck_layout_dump(const struct lu_env *env,
                           "run_time_phase2: %lld seconds\n"
                           "average_speed_phase1: %llu items/sec\n"
                           "average_speed_phase2: %llu objs/sec\n"
                           "run_time_phase2: %lld seconds\n"
                           "average_speed_phase1: %llu items/sec\n"
                           "average_speed_phase2: %llu objs/sec\n"

-                          "real-time_speed_phase1: N/A\n"
-                          "real-time_speed_phase2: N/A\n"
+                          "real_time_speed_phase1: N/A\n"
+                          "real_time_speed_phase2: N/A\n"

                           "current_position: N/A\n",
                           lo->ll_objs_checked_phase1,
                           lo->ll_objs_checked_phase2,
                           "current_position: N/A\n",
                           lo->ll_objs_checked_phase1,
                           lo->ll_objs_checked_phase2,

diff --git a/lustre/obdclass/scrub.c b/lustre/obdclass/scrub.c
index eee95c6..c4feee6 100644 (file)
--- a/lustre/obdclass/scrub.c
+++ b/lustre/obdclass/scrub.c
@@ -474,7 +474,7 @@ void scrub_dump(struct seq_file *m, struct lustre_scrub *scrub)
 
                seq_printf(m, "run_time: %lld seconds\n"
                           "average_speed: %lld objects/sec\n"
 
                seq_printf(m, "run_time: %lld seconds\n"
                           "average_speed: %lld objects/sec\n"

-                          "real-time_speed: %lld objects/sec\n"
+                          "real_time_speed: %lld objects/sec\n"

                           "current_position: %llu\n"
                           "scrub_in_prior: %s\n"
                           "scrub_full_speed: %s\n"
                           "current_position: %llu\n"
                           "scrub_in_prior: %s\n"
                           "scrub_full_speed: %s\n"


@@ -489,7 +489,7 @@ void scrub_dump(struct seq_file *m, struct lustre_scrub *scrub)
                        speed = div_s64(speed, sf->sf_run_time);
                seq_printf(m, "run_time: %ld seconds\n"
                           "average_speed: %lld objects/sec\n"
                        speed = div_s64(speed, sf->sf_run_time);
                seq_printf(m, "run_time: %ld seconds\n"
                           "average_speed: %lld objects/sec\n"

-                          "real-time_speed: N/A\n"
+                          "real_time_speed: N/A\n"

                           "current_position: N/A\n",
                           sf->sf_run_time, speed);
        }
                           "current_position: N/A\n",
                           sf->sf_run_time, speed);
        }

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 3e9e1b4..1987a48 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -5249,6 +5249,11 @@ test_36a() {
 
        check_mount_and_prep
 
 
        check_mount_and_prep
 

+       lfs df $DIR
+       lfs df -i $DIR
+       lctl get_param osc.*.*grant*
+       stack_trap "lfs df $DIR; lfs df -i $DIR; lctl get_param osc.*.*grant*"
+

        $LFS setstripe -N -E 1M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
                -N -E 3M -o 2,0 -E -1 -o 1 $DIR/$tdir/f0 ||
                error "(0) Fail to create mirror file $DIR/$tdir/f0"
        $LFS setstripe -N -E 1M -o 0,1 -E -1 -o 2 -N -E 2M -o 1,2 -E -1 -o 0 \
                -N -E 3M -o 2,0 -E -1 -o 1 $DIR/$tdir/f0 ||
                error "(0) Fail to create mirror file $DIR/$tdir/f0"