Branch b1_6

[fs/lustre-release.git] / lustre / tests / sanity-quota.sh

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 7049eaa..c4d6b81 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -190,8 +190,8 @@ test_1_sub() {
 
         rm -f $TESTFILE
        sync; sleep 1; sync;
-       OST0_UUID=`$LCTL dl | grep -m1 obdfilter | awk '{print $((NF-1))}'`
-       OST0_QUOTA_USED="`$LFS quota -o $OST0_UUID -u $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $1 }'`"
+       OST0_UUID=`do_facet ost1 $LCTL dl | grep -m1 obdfilter | awk '{print $((NF-1))}'`
+       OST0_QUOTA_USED=`$LFS quota -o $OST0_UUID -u $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $1 }'`
        echo $OST0_QUOTA_USED
        [ $OST0_QUOTA_USED -ne 0 ] && \
            ($SHOW_QUOTA_USER; error "quota deleted isn't released")
@@ -221,8 +221,8 @@ test_1_sub() {
        # cleanup
         rm -f $TESTFILE
        sync; sleep 1; sync;
-       OST0_UUID=`$LCTL dl | grep -m1 obdfilter | awk '{print $((NF-1))}'`
-       OST0_QUOTA_USED="`$LFS quota -o $OST0_UUID -g $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $1 }'`"
+       OST0_UUID=`do_facet ost1 $LCTL dl | grep -m1 obdfilter | awk '{print $((NF-1))}'`
+       OST0_QUOTA_USED=`$LFS quota -o $OST0_UUID -g $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $1 }'`
        echo $OST0_QUOTA_USED
        [ $OST0_QUOTA_USED -ne 0 ] && \
            ($SHOW_QUOTA_USER; error "quota deleted isn't released")
@@ -275,8 +275,8 @@ test_2_sub() {
        rm -f ${TESTFILE}_xxx
        sync; sleep 1; sync;
 
-       MDS_UUID=`$LCTL dl | grep -m1 mds | awk '{print $((NF-1))}'`
-       MDS_QUOTA_USED="`$LFS quota -o $MDS_UUID -u $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $4 }'`"
+       MDS_UUID=`do_facet mds $LCTL dl | grep -m1 mds | awk '{print $((NF-1))}'`
+       MDS_QUOTA_USED=`$LFS quota -o $MDS_UUID -u $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $4 }'`
        echo $MDS_QUOTA_USED
        [ $MDS_QUOTA_USED -ne 0 ] && \
            ($SHOW_QUOTA_USER; error "quota deleted isn't released")
@@ -303,8 +303,8 @@ test_2_sub() {
        rm -f ${TESTFILE}_xxx
        sync; sleep 1; sync;
 
-       MDS_UUID=`$LCTL dl | grep -m1 mds | awk '{print $((NF-1))}'`
-       MDS_QUOTA_USED="`$LFS quota -o $MDS_UUID -g $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $4 }'`"
+       MDS_UUID=`do_facet mds $LCTL dl | grep -m1 mds | awk '{print $((NF-1))}'`
+       MDS_QUOTA_USED=`$LFS quota -o $MDS_UUID -g $TSTUSR $DIR | awk '/^.*[[:digit:]+][[:space:]+]/ { print $4 }'`
        echo $MDS_QUOTA_USED
        [ $MDS_QUOTA_USED -ne 0 ] && \
            ($SHOW_QUOTA_USER; error "quota deleted isn't released")
@@ -1337,16 +1337,17 @@ test_18() {
 
        echo  "   step2: testing ......"
        count=0
+       timeout=$(sysctl -n lustre.timeout)
        while [ true ]; do
            if [ -z `ps -ef | awk '$2 == '${DDPID}' { print $8 }'` ]; then break; fi
            count=$[count+1]
-           if [ $count -gt 200 ]; then
-               error "dd should be finished!"
+           if [ $count -gt $((2 * $timeout)) ]; then
+               error "count=$count dd should be finished!"
            fi
            sleep 1
        done
-        log -n "(dd_pid=$DDPID, time=$count)"
-        if [ $count -lt 90 ]; then
+        log "(dd_pid=$DDPID, time=$count, timeout=$timeout)"
+        if [ $count -lt $(($timeout - 10)) ]; then
             error " should take longer!"
         else
             echo " successful"
@@ -1388,17 +1389,18 @@ test_18a() {
 
        echo  "   step2: testing ......"
        count=0
+       timeout=$(sysctl -n lustre.timeout)
        while [ true ]; do
            if [ -z `ps -ef | awk '$2 == '${DDPID}' { print $8 }'` ]; then break; fi
            count=$[count+1]
-           if [ $count -gt 200 ]; then
+           if [ $count -gt $((3 * $timeout)) ]; then
                lustre_fail mds 0
-               error "dd should be finished!"
+               error "count=$count dd should be finished!"
            fi
            sleep 1
        done
-        log -n "(dd_pid=$DDPID, time=$count)"
-        if [ $count -lt 90 ]; then
+        log "(dd_pid=$DDPID, time=$count, timeout=$timeout)"
+        if [ $count -lt $(($timeout - 10)) ]; then
            lustre_fail mds 0
             error " should take longer!"
         else