From 1eae3bfd5de6eecbe70d24681890ad070e8446f8 Mon Sep 17 00:00:00 2001
From: Hongchao Zhang <hongchao.zhang@intel.com>
Date: Tue, 5 Dec 2017 03:47:30 +0800
Subject: [PATCH] LU-10052 tests: wait for OST objects to be deleted

In test_20b of replay-single, the used space difference after
the file creation and deletion shows that a block is not freed,
wait for OST objects to be destroyed after recovery is done.

Test-Parameters: trivial testlist=replay-single.sh ostfilesystemtype=zfs mdtfilesystemtype=zfs
Signed-off-by: Hongchao Zhang <hongchao.zhang@intel.com>
Change-Id: I6311d8b8fa4cea713a9755cfb6a3d63e693c8344
Reviewed-on: https://review.whamcloud.com/30678
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Mike Pershin <mike.pershin@intel.com>
---
 lustre/tests/replay-single.sh | 46 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index 50fe016..7821118 100755
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -448,35 +448,33 @@ run_test 20a "|X| open(O_CREAT), unlink, replay, close (test mds_cleanup_orphans
 
 test_20b() { # bug 10480
 	local wait_timeout=$((TIMEOUT * 4))
-	local BEFOREUSED
-	local AFTERUSED
+	local beforeused
+	local afterused
 
-	BEFOREUSED=$(df -P $DIR | tail -1 | awk '{ print $3 }')
+	beforeused=$(df -P $DIR | tail -1 | awk '{ print $3 }')
 	dd if=/dev/zero of=$DIR/$tfile bs=4k count=10000 &
 	while [ ! -e $DIR/$tfile ] ; do
-		usleep 60                      # give dd a chance to start
+		usleep 60			# give dd a chance to start
 	done
 
-	$GETSTRIPE $DIR/$tfile || error "$GETSTRIPE $DIR/$tfile failed"
+	$LFS getstripe $DIR/$tfile || error "$LFS getstripe $DIR/$tfile failed"
 	# make it an orphan
 	rm -f $DIR/$tfile || error "rm -f $DIR/$tfile failed"
 	mds_evict_client
-	client_up || client_up || true    # reconnect
+	client_up || client_up || true		# reconnect
 
-	do_facet $SINGLEMDS "lctl set_param -n osd*.*MDT*.force_sync 1"
+	do_facet $SINGLEMDS "lctl set_param -n osd*.*MDT*.force_sync=1"
 
-	fail $SINGLEMDS                            # start orphan recovery
+	fail $SINGLEMDS				# start orphan recovery
 	wait_recovery_complete $SINGLEMDS || error "MDS recovery not done"
-	wait_delete_completed_mds $wait_timeout ||
-		error "delete did not complete"
+	wait_delete_completed $wait_timeout || error "delete did not finish"
 
-	AFTERUSED=$(df -P $DIR | tail -1 | awk '{ print $3 }')
-	log "before $BEFOREUSED, after $AFTERUSED"
-	(( $AFTERUSED > $BEFOREUSED + $(fs_log_size) )) &&
-		error "after $AFTERUSED > before $BEFOREUSED"
-	return 0
+	afterused=$(df -P $DIR | tail -1 | awk '{ print $3 }')
+	(( $afterused > $beforeused + $(fs_log_size) )) &&
+		error "after $afterused > before $beforeused" ||
+		log "before $beforeused, after $afterused"
 }
-run_test 20b "write, unlink, eviction, replay, (test mds_cleanup_orphans)"
+run_test 20b "write, unlink, eviction, replay (test mds_cleanup_orphans)"
 
 test_20c() { # bug 10480
 	multiop_bg_pause $DIR/$tfile Ow_c ||
@@ -3282,17 +3280,17 @@ test_89() {
 	[ $((BLOCKS2 - BLOCKS1)) -le 4  ] ||
 		error $((BLOCKS2 - BLOCKS1)) blocks leaked
 }
-
 run_test 89 "no disk space leak on late ost connection"
 
 cleanup_90 () {
-    local facet=$1
-    trap 0
-    reboot_facet $facet
-    change_active $facet
-    wait_for_facet $facet
-    mount_facet $facet || error "Restart of $facet failed"
-    clients_up
+	local facet=$1
+
+	trap 0
+	reboot_facet $facet
+	change_active $facet
+	wait_for_facet $facet
+	mount_facet $facet || error "Restart of $facet failed"
+	clients_up
 }
 
 test_90() { # bug 19494
-- 
1.8.3.1