From f1cbfb96c820aa7e1e5a84176619679d696a117a Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Mon, 1 Apr 2019 22:49:53 -0400 Subject: [PATCH] LU-12232 test: commit before df In sub_test6 of replay_ost_single, the transactions at OSTs should be committed to cleanup the test environment. Test-Parameters: trivial Signed-off-by: Hongchao Zhang Change-Id: Icbb06789855ab02252b7f1b0b9aff6bbb0f5f2e1 Reviewed-on: https://review.whamcloud.com/34808 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Patrick Farrell Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/replay-ost-single.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/tests/replay-ost-single.sh b/lustre/tests/replay-ost-single.sh index 9764e6b..d85bf3c 100755 --- a/lustre/tests/replay-ost-single.sh +++ b/lustre/tests/replay-ost-single.sh @@ -196,6 +196,7 @@ test_6() { # (( $before > $after_dd)) test counting on that wait_mds_ost_sync || error "first wait_mds_ost_sync failed" wait_destroy_complete || error "first wait_destroy_complete failed" + sync_all_data local before=$(kbytesfree) dd if=/dev/urandom bs=4096 count=1280 of=$f || error "dd failed" @@ -219,9 +220,10 @@ test_6() { after_dd=$(kbytesfree) done - log "before: $before after_dd: $after_dd took $i seconds" + log "before_free: $before after_dd_free: $after_dd took $i seconds" (( $before > $after_dd )) || - error "space grew after dd: before:$before after_dd:$after_dd" + error "free grew after dd: before:$before after_dd:$after_dd" + rm -f $f fail ost$((stripe_index + 1)) wait_recovery_complete ost$((stripe_index + 1)) || @@ -232,7 +234,7 @@ test_6() { wait_mds_ost_sync || error "second wait_mds_ost_sync failed" wait_delete_completed || error "second wait_delete_completed failed" local after=$(kbytesfree) - log "before: $before after: $after" + log "free_before: $before free_after: $after" (( $before <= $after + $(fs_log_size) )) || error "$before > $after + logsize $(fs_log_size)" } -- 1.8.3.1