From: Andreas Dilger <andreas.dilger@intel.com>
Date: Wed, 22 Feb 2017 21:24:44 +0000 (-0700)
Subject: LU-7537 tests: clean up sanity test_133c
X-Git-Tag: 2.9.55~55
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6937a7dc35f2c28403d0f5ceb5e15b67db3b78fe

LU-7537 tests: clean up sanity test_133c

Fix up code style for sanity.sh test_133c.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Id8d20e14cbf825f81eff40afd44a1d8998738819
Reviewed-on: https://review.whamcloud.com/25583
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 2216581..386a74b 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -9344,22 +9344,27 @@ test_131e() {
 run_test 131e "test read hitting hole"
 
 check_stats() {
+	local facet=$1
+	local op=$2
+	local want=${3:-0}
 	local res
-	local count
-	case $1 in
-	$SINGLEMDS) res=`do_facet $SINGLEMDS $LCTL get_param mdt.$FSNAME-MDT0000.md_stats | grep "$2"`
+
+	case $facet in
+	mds*) res=$(do_facet $facet \
+		   $LCTL get_param mdt.$FSNAME-MDT0000.md_stats | grep "$op")
 		 ;;
-	ost) res=`do_facet ost1 $LCTL get_param obdfilter.$FSNAME-OST0000.stats | grep "$2"`
+	ost*) res=$(do_facet $facet \
+		   $LCTL get_param obdfilter.$FSNAME-OST0000.stats | grep "$op")
 		 ;;
-	*) error "Wrong argument $1" ;;
+	*) error "Wrong facet '$facet'" ;;
 	esac
 	echo $res
-	[ -z "$res" ] && error "The counter for $2 on $1 was not incremented"
+	[ "$res" ] || error "The counter for $op on $facet was not incremented"
 	# if the argument $3 is zero, it means any stat increment is ok.
-	if [[ $3 -gt 0 ]]; then
-		count=$(echo $res | awk '{ print $2 }')
-		[[ $count -ne $3 ]] &&
-			error "The $2 counter on $1 is wrong - expected $3"
+	if [[ $want -gt 0 ]]; then
+		local count=$(echo $res | awk '{ print $2 }')
+		[[ $count -ne $want ]] &&
+			error "The $op counter on $facet is $count, not $want"
 	fi
 }
 
@@ -9459,17 +9464,17 @@ test_133c() {
 	dd if=/dev/zero of=${testdir}/${tfile} conv=notrunc bs=512k count=1 || error "dd failed"
 	sync
 	cancel_lru_locks osc
-	check_stats ost "write" 1
+	check_stats ost1 "write" 1
 
 	dd if=${testdir}/${tfile} of=/dev/null bs=1k count=1 || error "dd failed"
-	check_stats ost "read" 1
+	check_stats ost1 "read" 1
 
 	> ${testdir}/${tfile} || error "truncate failed"
-	check_stats ost "punch" 1
+	check_stats ost1 "punch" 1
 
 	rm -f ${testdir}/${tfile} || error "file remove failed"
 	wait_delete_completed
-	check_stats ost "destroy" 1
+	check_stats ost1 "destroy" 1
 
 	rm -rf $DIR/${tdir}
 }