From: Alex Zhuravlev <bzzz@whamcloud.com>
Date: Tue, 28 Jan 2020 23:00:59 +0000 (+0300)
Subject: LU-13175 tests: sanity/803 to sync MDTs for actual statfs
X-Git-Tag: 2.15.53~140
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F46%2F37346%2F9;p=fs%2Flustre-release.git

LU-13175 tests: sanity/803 to sync MDTs for actual statfs

as number of dnodes is updated at commit.

Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: I037064419a4674fe8e269b68e41f97c0f3763332
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/37346
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Colin Faber <cfaber@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 437d86a..a6eb8f3 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -27771,8 +27771,8 @@ test_803a() {
 			error "Fail to create $DIR/$tdir/dir${idx}"
 	done
 
-	sync; sleep 3
 	wait_delete_completed # ensure old test cleanups are finished
+	sleep 3
 	echo "before create:"
 	$LFS df -i $MOUNT
 	local before_used=$($LFS df -i | grep MDT0000_UUID | awk '{print $3}')
@@ -27782,7 +27782,9 @@ test_803a() {
 			error "Fail to create $DIR/$tdir/foo$i"
 	done
 
-	sync; sleep 3
+	# sync ZFS-on-MDS to refresh statfs data
+	wait_zfs_commit mds1
+	sleep 3
 	echo "after create:"
 	$LFS df -i $MOUNT
 	local after_used=$($LFS df -i | grep MDT0000_UUID | awk '{print $3}')
@@ -27796,8 +27798,10 @@ test_803a() {
 			error "Fail to remove $DIR/$tdir/foo$i"
 	done
 
-	sleep 3 # avoid MDT return cached statfs
+	# sync ZFS-on-MDS to refresh statfs data
+	wait_zfs_commit mds1
 	wait_delete_completed
+	sleep 3 # avoid MDT return cached statfs
 	echo "after unlink:"
 	$LFS df -i $MOUNT
 	after_used=$($LFS df -i | grep MDT0000_UUID | awk '{print $3}')