From f35abef1df5309512c59151387c4e134a99ae642 Mon Sep 17 00:00:00 2001 From: Niu Yawei Date: Mon, 14 Apr 2014 12:06:11 +0800 Subject: [PATCH] LU-4422 quota: fix s-q test_6 s-q test_6 should not fail by checking whether the file is growing, because in most time, the test is waiting for quota slave reconnecting to quota master. This patch is back-ported from the following one: Lustre-commit: a1cf492e3632e2930b9593817d9397ba1b378fda Lustre-change: http://review.whamcloud.com/9339 Signed-off-by: Jian Yu Change-Id: I5c40e704266672af270e8306dff1fb867af1b8b5 Reviewed-on: http://review.whamcloud.com/9946 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Niu Yawei Reviewed-by: Bob Glossman Reviewed-by: Fan Yong Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index c1e3a31..1d030f3 100644 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -930,9 +930,8 @@ test_6() { rm -f $TMP/lustre-log-${TESTNAME}.log - # write should continue & succeed + # write should continue then fail with EDQUOT local count=0 - local o_size=$(stat -c %s $TESTFILE) local c_size while [ true ]; do if ! ps -p ${DDPID} > /dev/null 2>&1; then break; fi @@ -942,13 +941,8 @@ test_6() { count=$((count + 1)) if [ $((count % 30)) -eq 0 ]; then c_size=$(stat -c %s $TESTFILE) - if [ $c_size -eq $o_size ]; then - quota_error u $TSTUSR "file not growed" \ - "in 30 seconds $o_size/$c_size" - else - echo "Waiting $count secs. $o_size/$c_size" - o_size=$c_size - fi + echo "Waiting $count secs. $c_size" + $SHOW_QUOTA_USER fi sleep 1 done -- 1.8.3.1