From 2ad3935e89aac78ce73f3bcdbecd8286cfa52970 Mon Sep 17 00:00:00 2001 From: wangdi Date: Tue, 13 Mar 2012 23:36:25 -0700 Subject: [PATCH] LU-1209 tests: add debug info to 133d Add more information in 133d to help understanding the failure. Signed-off-by: Wang Di Change-Id: Ic84120fa5adcab9490abce732993c7c90d3e2881 Reviewed-on: http://review.whamcloud.com/2309 Reviewed-by: Andreas Dilger Tested-by: Hudson Tested-by: Maloo Reviewed-by: Yu Jian Reviewed-by: Oleg Drokin --- lustre/tests/sanity.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index f1e2629..1a47857 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -7436,7 +7436,7 @@ size_in_KMGT() { get_rename_size() { local size=$1 - local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | \ + local sample=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | awk '/ '${size}'/ {print $4}' | sed -e "s/,//g") echo $sample } @@ -7453,9 +7453,9 @@ test_133d() { mkdir -p ${testdir2} || error "mkdir failed" createmany -o $testdir1/test 512 || error "createmany failed" - local testdir1_size=$(ls -l $DIR/${tdir} | \ + local testdir1_size=$(ls -l $DIR/${tdir} | awk '/stats_testdir1/ {print $5}') - local testdir2_size=$(ls -l $DIR/${tdir} | \ + local testdir2_size=$(ls -l $DIR/${tdir} | awk '/stats_testdir2/ {print $5}') testdir1_size=$(order_2 $testdir1_size) @@ -7464,27 +7464,31 @@ test_133d() { testdir1_size=$(size_in_KMGT $testdir1_size) testdir2_size=$(size_in_KMGT $testdir2_size) + echo "source rename dir size: ${testdir1_size}" + echo "target rename dir size: ${testdir2_size}" + # check samedir rename size mv ${testdir1}/test0 ${testdir1}/test_0 - local samedir=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | \ - grep 'same_dir') + local cmd="do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats" + eval $cmd || error "$cmd failed" + local samedir=$($cmd | grep 'same_dir') local same_sample=$(get_rename_size $testdir1_size) [ -z "$samedir" ] && error "samedir_rename_size count error" - [ $same_sample -eq 1 ] || error "samedir_rename_size count error" + [ "$same_sample" -eq 1 ] || error "samedir_rename_size error $same_sample" echo "Check same dir rename stats success" - # check crossdir rename size do_facet $SINGLEMDS $LCTL set_param mdt.*.rename_stats=clear + + # check crossdir rename size mv ${testdir1}/test_0 ${testdir2}/test_0 - local crossdir=$(do_facet $SINGLEMDS $LCTL get_param mdt.*.rename_stats | \ - grep 'crossdir') + eval $cmd || error "$cmd failed" + local crossdir=$($cmd | grep 'crossdir') local src_sample=$(get_rename_size $testdir1_size) local tgt_sample=$(get_rename_size $testdir2_size) [ -z "$crossdir" ] && error "crossdir_rename_size count error" - [ $src_sample -eq 1 ] || error "crossdir_rename_size count error" - [ $tgt_sample -eq 1 ] || error "crossdir_rename_size count error" + [ "$src_sample" -eq 1 ] || error "crossdir_rename_size error $src_sample" + [ "$tgt_sample" -eq 1 ] || error "crossdir_rename_size error $tgt_sample" echo "Check cross dir rename stats success" - rm -rf $DIR/${tdir} } run_test 133d "Verifying rename_stats ========================================" -- 1.8.3.1