From 3c0b60fbb7268ae1e0a8d6804d5bd2656b1ecfec Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Fri, 10 Dec 2021 10:04:26 +0530 Subject: [PATCH] LU-15358 tests: Variable incorrectly defined under sanityn Under sanityn.sh/print_jbd_stat() local variable was incorrectly defined. This was exposed using shellcheck. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In lustre/tests/sanityn.sh line 950: local varcvs ^-- SC2034: varcvs appears unused. Verify it or export it. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Test-Parameters: trivial testlist=sanityn Signed-off-by: Arshad Hussain Change-Id: I7b2f62c15e420a4c6f5d71445a2e940816e20098 Reviewed-on: https://review.whamcloud.com/45819 Tested-by: jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: James Nunez --- lustre/tests/sanityn.sh | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index 70a6af7..2cbb21f 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -945,22 +945,23 @@ test_32b() { # bug 11270 #run_test 32b "lockless i/o" print_jbd_stat () { - local dev - local mdts=$(get_facets MDS) - local varcvs - local mds - - local stat=0 - for mds in ${mdts//,/ }; do - varsvc=${mds}_svc - dev=$(basename $(do_facet $mds "lctl get_param -n osd*.${!varsvc}.mntdev|\ - xargs readlink -f" )) - val=$(do_facet $mds "cat /proc/fs/jbd*/${dev}{,:*,-*}/info 2>/dev/null | - head -n1") - val=${val%% *}; - stat=$(( stat + val)) - done - echo $stat + local mdts=$(get_facets MDS) + local stat=0 + local varsvc + local dev + local mds + + for mds in ${mdts//,/ }; do + varsvc=${mds}_svc + + dev=$(basename $(do_facet $mds "lctl get_param -n \ + osd*.${!varsvc}.mntdev | xargs readlink -f")) + val=$(do_facet $mds "cat /proc/fs/jbd*/${dev}{,:*,-*}/info \ + 2>/dev/null | head -n1") + val=${val%% *}; + stat=$((stat + val)) + done + echo $stat } # commit on sharing tests -- 1.8.3.1