X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-quota.sh;h=876d2f3e87831b788908ef9a7ca5202266dce554;hb=8e166d9f0d7fd4405c9f0ba7c566fc0c021309ce;hp=0c30d304590e4087632315eb852db782e4bd5266;hpb=470339f456d8e5d27fa7a10103432ae264bf88f4;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 0c30d30..876d2f3 100644
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -189,15 +189,15 @@ resetquota() {
         fi
 
         while [ $((count++)) -lt $timeout ]; do
-                $LFS setquota "$1" "$2" -b 0 -B 0 -i 0 -I 0 $MOUNT
-                RC=$?
+		local RC=0
+		OUTPUT=`$LFS setquota "$1" "$2" -b 0 -B 0 -i 0 -I 0 $MOUNT 2>&1` || RC=${PIPESTATUS[0]}
                 if [ $RC -ne 0 ]; then
-                        if [ $RC -eq 240 ]; then # 240 means -EBUSY
-                                log "resetquota is blocked for quota master recovery, retry after 1 sec"
-                                sleep 1
+			if echo "$OUTPUT" | grep -q busy; then
+                                log "resetquota is blocked for quota master recovery, retry after $((count * 3)) sec"
+                                sleep 3
                                 continue
                         else
-                                error "resetquota failed: $RC"
+                                error "resetquota failed"
                         fi
                 fi
                 break