From c50bd08b35757d20e606c10bb5b4474011dd07f6 Mon Sep 17 00:00:00 2001
From: Mikhail Pershin <mpershin@whamcloud.com>
Date: Fri, 26 Oct 2018 12:07:04 +0300
Subject: [PATCH] LU-11430 tests: get MDC stats by index

Fix test groups 270 and 271 in sanity.sh and
100 in sanityn.sh to get MDC stats using particular
MDC index to prevent multiline output before 'awk'.
In some cases use just 'grep -c' for simpler checks.

Signed-off-by: Mikhail Pershin <mpershin@whamcloud.com>
Change-Id: I6bd36192ab800418e3ddb745e128b5ea4d5e20c4
Reviewed-on: https://review.whamcloud.com/33490
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 lustre/tests/sanity.sh  | 99 +++++++++++++++++++++----------------------------
 lustre/tests/sanityn.sh | 24 ++++++------
 2 files changed, 53 insertions(+), 70 deletions(-)

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 279330d..32e4639 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -17030,9 +17030,8 @@ test_271a() {
 	lctl set_param -n mdc.*.stats=clear
 	dd if=/dev/zero of=$dom bs=4096 count=1 || return 1
 	cat $dom > /dev/null
-	local reads=$(lctl get_param -n mdc.*.stats |
-			awk '/ost_read/ {print $2}')
-	[ -z $reads ] || error "Unexpected $reads READ RPCs"
+	local reads=$(lctl get_param -n mdc.*.stats | grep -c ost_read)
+	[ $reads -eq 0 ] || error "Unexpected $reads READ RPCs"
 	ls $dom
 	rm -f $dom
 }
@@ -17054,9 +17053,8 @@ test_271b() {
 	$CHECKSTAT -t file -s 4096 $dom || error "stat #1 fails"
 	# second stat to check size is cached on client
 	$CHECKSTAT -t file -s 4096 $dom || error "stat #2 fails"
-	local gls=$(lctl get_param -n mdc.*.stats |
-			awk '/ldlm_glimpse/ {print $2}')
-	[ -z $gls ] || error "Unexpected $gls glimpse RPCs"
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -eq 0 ] || error "Unexpected $gls glimpse RPCs"
 	rm -f $dom
 }
 run_test 271b "DoM: no glimpse RPC for stat (DoM only file)"
@@ -17078,16 +17076,27 @@ test_271ba() {
 	$CHECKSTAT -t file -s 2097152 $dom || error "stat"
 	# second stat to check size is cached on client
 	$CHECKSTAT -t file -s 2097152 $dom || error "stat"
-	local gls=$(lctl get_param -n mdc.*.stats |
-			awk '/ldlm_glimpse/ {print $2}')
-	[ -z $gls ] || error "Unexpected $gls glimpse RPCs"
-	local gls=$(lctl get_param -n osc.*.stats |
-			awk '/ldlm_glimpse/ {print $2}')
-	[ -z $gls ] || error "Unexpected $gls OSC glimpse RPCs"
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	[ $gls == 0 ] || error "Unexpected $gls glimpse RPCs"
+	local gls=$(lctl get_param -n osc.*.stats | grep -c ldlm_glimpse)
+	[ $gls == 0 ] || error "Unexpected $gls OSC glimpse RPCs"
 	rm -f $dom
 }
 run_test 271ba "DoM: no glimpse RPC for stat (combined file)"
 
+
+get_mdc_stats() {
+	local mdtidx=$1
+	local param=$2
+	local mdt=MDT$(printf %04x $mdtidx)
+
+	if [ -z $param ]; then
+		lctl get_param -n mdc.*$mdt*.stats
+	else
+		lctl get_param -n mdc.*$mdt*.stats | awk "/$param/"'{print $2}'
+	fi
+}
+
 test_271c() {
 	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.10.55) ] &&
 		skip "Need MDS version at least 2.10.55"
@@ -17106,9 +17115,8 @@ test_271c() {
 	createmany -o $dom 1000
 	lctl set_param -n mdc.*.stats=clear
 	smalliomany -w $dom 1000 200
-	lctl get_param -n mdc.*.stats
-	local enq=$(lctl get_param -n mdc.*.stats |
-			awk '/ldlm_ibits_enqueue/ {print $2}')
+	get_mdc_stats $mdtidx
+	local enq=$(get_mdc_stats $mdtidx ldlm_ibits_enqueue)
 	# Each file has 1 open, 1 IO enqueues, total 2000
 	# but now we have also +1 getxattr for security.capability, total 3000
 	[ $enq -ge 2000 ] || error "Too few enqueues $enq, expected > 2000"
@@ -17119,9 +17127,7 @@ test_271c() {
 	createmany -o $dom 1000
 	lctl set_param -n mdc.*.stats=clear
 	smalliomany -w $dom 1000 200
-	lctl get_param -n mdc.*.stats
-	local enq_2=$(lctl get_param -n mdc.*.stats |
-			awk '/ldlm_ibits_enqueue/ {print $2}')
+	local enq_2=$(get_mdc_stats $mdtidx ldlm_ibits_enqueue)
 	# Expect to see reduced amount of RPCs by 1000 due to single enqueue
 	# for OPEN and IO lock.
 	[ $((enq - enq_2)) -ge 1000 ] ||
@@ -17149,7 +17155,6 @@ test_271d() {
 	$LFS setstripe -E 1024K -L mdt $DIR/$tdir
 
 	local mdtidx=$($GETSTRIPE -M $DIR/$tdir)
-	local facet=mds$((mdtidx + 1))
 
 	cancel_lru_locks mdc
 	dd if=/dev/urandom of=$tmp bs=1000 count=1
@@ -17162,12 +17167,9 @@ test_271d() {
 	# append data to the same file it should update local page
 	echo "Append to the same page"
 	cat /etc/hosts >> $dom
-	local num=$(lctl get_param -n mdc.*.stats |
-		awk '/ost_read/ {print $2}')
-	local ra=$(lctl get_param -n mdc.*.stats |
-		awk '/req_active/ {print $2}')
-	local rw=$(lctl get_param -n mdc.*.stats |
-		awk '/req_waittime/ {print $2}')
+	local num=$(get_mdc_stats $mdtidx ost_read)
+	local ra=$(get_mdc_stats $mdtidx req_active)
+	local rw=$(get_mdc_stats $mdtidx req_waittime)
 
 	[ -z $num ] || error "$num READ RPC occured"
 	[ $ra == $rw ] || error "$((ra - rw)) resend occured"
@@ -17181,12 +17183,9 @@ test_271d() {
 
 	echo "Open and read file"
 	cat $dom > /dev/null
-	local num=$(lctl get_param -n mdc.*.stats |
-		awk '/ost_read/ {print $2}')
-	local ra=$(lctl get_param -n mdc.*.stats |
-		awk '/req_active/ {print $2}')
-	local rw=$(lctl get_param -n mdc.*.stats |
-		awk '/req_waittime/ {print $2}')
+	local num=$(get_mdc_stats $mdtidx ost_read)
+	local ra=$(get_mdc_stats $mdtidx req_active)
+	local rw=$(get_mdc_stats $mdtidx req_waittime)
 
 	[ -z $num ] || error "$num READ RPC occured"
 	[ $ra == $rw ] || error "$((ra - rw)) resend occured"
@@ -17212,7 +17211,6 @@ test_271e() {
 	$LFS setstripe -E 1024K -L mdt $DIR/$tdir
 
 	local mdtidx=$($GETSTRIPE -M $DIR/$tdir)
-	local facet=mds$((mdtidx + 1))
 
 	cancel_lru_locks mdc
 	dd if=/dev/urandom of=$tmp bs=30K count=1
@@ -17224,12 +17222,9 @@ test_271e() {
 	echo "Append to the same page"
 	cat /etc/hosts >> $dom
 
-	local num=$(lctl get_param -n mdc.*.stats | \
-		awk '/ost_read/ {print $2}')
-	local ra=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_active/ {print $2}')
-	local rw=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_waittime/ {print $2}')
+	local num=$(get_mdc_stats $mdtidx ost_read)
+	local ra=$(get_mdc_stats $mdtidx req_active)
+	local rw=$(get_mdc_stats $mdtidx req_waittime)
 
 	[ -z $num ] || error "$num READ RPC occured"
 	# Reply buffer can be adjusted for larger buffer by resend
@@ -17243,12 +17238,9 @@ test_271e() {
 
 	echo "Open and read file"
 	cat $dom > /dev/null
-	local num=$(lctl get_param -n mdc.*.stats | \
-		awk '/ost_read/ {print $2}')
-	local ra=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_active/ {print $2}')
-	local rw=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_waittime/ {print $2}')
+	local num=$(get_mdc_stats $mdtidx ost_read)
+	local ra=$(get_mdc_stats $mdtidx req_active)
+	local rw=$(get_mdc_stats $mdtidx req_waittime)
 
 	[ -z $num ] || error "$num READ RPC occured"
 	# Reply buffer can be adjusted for larger buffer by resend
@@ -17274,7 +17266,6 @@ test_271f() {
 	$LFS setstripe -E 1024K -L mdt $DIR/$tdir
 
 	local mdtidx=$($GETSTRIPE -M $DIR/$tdir)
-	local facet=mds$((mdtidx + 1))
 
 	cancel_lru_locks mdc
 	dd if=/dev/urandom of=$tmp bs=200000 count=1
@@ -17285,12 +17276,9 @@ test_271f() {
 
 	echo "Append to the same page"
 	cat /etc/hosts >> $dom
-	local num=$(lctl get_param -n mdc.*.stats | \
-		awk '/ost_read/ {print $2}')
-	local ra=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_active/ {print $2}')
-	local rw=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_waittime/ {print $2}')
+	local num=$(get_mdc_stats $mdtidx ost_read)
+	local ra=$(get_mdc_stats $mdtidx req_active)
+	local rw=$(get_mdc_stats $mdtidx req_waittime)
 
 	[ -z $num ] || error "$num READ RPC occured"
 	[ $ra == $rw ] || error "$((ra - rw)) resend occured"
@@ -17304,12 +17292,9 @@ test_271f() {
 
 	echo "Open and read file"
 	cat $dom > /dev/null
-	local num=$(lctl get_param -n mdc.*.stats | \
-		awk '/ost_read/ {print $2}')
-	local ra=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_active/ {print $2}')
-	local rw=$(lctl get_param -n mdc.*.stats | \
-		awk '/req_waittime/ {print $2}')
+	local num=$(get_mdc_stats $mdtidx ost_read)
+	local ra=$(get_mdc_stats $mdtidx req_active)
+	local rw=$(get_mdc_stats $mdtidx req_waittime)
 
 	[ $num -eq 1 ] || error "expect 1 READ RPC, $num occured"
 	[ $ra == $rw ] || error "$((ra - rw)) resend occured"
diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh
index d77c7ba..42beac1 100755
--- a/lustre/tests/sanityn.sh
+++ b/lustre/tests/sanityn.sh
@@ -4308,14 +4308,13 @@ test_100a() {
 
 	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #1"
 	# first stat from server should return size data and save glimpse
-	local gls=$(lctl get_param -n mdc.*.stats | \
-		awk '/ldlm_glimpse/ {print $2}')
-	[ -z $gls ] || error "Unexpected $gls glimpse RPCs"
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -eq 0 ] || error "Unexpected $gls glimpse RPCs"
 	# second stat to check size is NOT cached on client without IO lock
 	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #2"
 
-	local gls=$(lctl get_param -n mdc.*.stats | grep ldlm_glimpse | wc -l)
-	[ "1" == "$gls" ] || error "Expect 1 glimpse RPCs but got $gls"
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
+	[ $gls -ge 1 ] || error "Expect glimpse RPCs but none"
 	rm -f $dom
 }
 run_test 100a "DoM: glimpse RPCs for stat without IO lock (DoM only file)"
@@ -4336,10 +4335,9 @@ test_100b() {
 	# second stat to check size is cached on client
 	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom || error "stat #2"
 
-	local gls=$(lctl get_param -n mdc.*.stats |
-			awk '/ldlm_glimpse/ {print $2}')
+	local gls=$(lctl get_param -n mdc.*.stats | grep -c ldlm_glimpse)
 	# both stats should cause no glimpse requests
-	[ -z $gls ] || error "Unexpected $gls glimpse RPCs"
+	[ $gls == 0 ] || error "Unexpected $gls glimpse RPCs"
 	rm -f $dom
 }
 run_test 100b "DoM: no glimpse RPC for stat with IO lock (DoM only file)"
@@ -4360,7 +4358,7 @@ test_100c() {
 	$CHECKSTAT -t file -s 2097152 $DIR/$tdir/dom ||
 		error "Wrong size from stat #1"
 
-	local gls=$(lctl get_param -n osc.*.stats | grep ldlm_glimpse | wc -l)
+	local gls=$(lctl get_param -n osc.*.stats | grep -c ldlm_glimpse)
 	[ $gls -eq 0 ] && error "Expect OST glimpse RPCs but got none"
 
 	rm -f $dom
@@ -4385,7 +4383,7 @@ test_100d() {
 	$CHECKSTAT -t file -s 4096 $DIR/$tdir/dom ||
 		error "Wrong size from stat #1"
 
-	local gls=$(lctl get_param -n osc.*.stats | grep ldlm_glimpse | wc -l)
+	local gls=$(lctl get_param -n osc.*.stats | grep -c ldlm_glimpse)
 	[ $gls -eq 0 ] && error "Expect OST glimpse but got none"
 
 	rm -f $dom
@@ -4412,7 +4410,7 @@ test_101a() {
 	lctl set_param -n mdc.*.stats=clear
 	rm $DIR2/$tfile || error "Unlink fails"
 
-	local writes=$(lctl get_param -n mdc.*.stats | grep ost_write | wc -l)
+	local writes=$(lctl get_param -n mdc.*.stats | grep -c ost_write)
 	[ $writes -eq 0 ] || error "Found WRITE RPC but expect none"
 }
 run_test 101a "Discard DoM data on unlink"
@@ -4437,7 +4435,7 @@ test_101b() {
 	lctl set_param -n mdc.*.stats=clear
 	mv $DIR2/${tfile}_2 $DIR2/$tfile || error "Rename fails"
 
-	local writes=$(lctl get_param -n mdc.*.stats | grep ost_write | wc -l)
+	local writes=$(lctl get_param -n mdc.*.stats | grep -c ost_write)
 	[ $writes -eq 0 ] || error "Found WRITE RPC but expect none"
 }
 run_test 101b "Discard DoM data on rename"
@@ -4464,7 +4462,7 @@ test_101c() {
 	rm $DIR2/$tfile > /dev/null || error "Unlink fails for opened file"
 	kill -USR1 $MULTIOP_PID && wait $MULTIOP_PID || error "multiop failure"
 
-	local writes=$(lctl get_param -n mdc.*.stats | grep ost_write | wc -l)
+	local writes=$(lctl get_param -n mdc.*.stats | grep -c ost_write)
 	[ $writes -eq 0 ] || error "Found WRITE RPC but expect none"
 }
 run_test 101c "Discard DoM data on close-unlink"
-- 
1.8.3.1