b=16890

i=Johann Lombardi
i=ZhiYong Tian
i=Elena Gryaznova

get rid of noisy config messages

diff --git a/lustre/quota/lproc_quota.c b/lustre/quota/lproc_quota.c
index 69b3f1c..52ddd1d 100644 (file)
--- a/lustre/quota/lproc_quota.c
+++ b/lustre/quota/lproc_quota.c
@@ -319,13 +319,15 @@ static int filter_quota_set_version(struct obd_device *obd,
                 return -EBUSY;
         }
 
-        if (obt->obt_qctxt.lqc_flags & (LQC_USRQUOTA_FLAG | LQC_GRPQUOTA_FLAG)) {
-                atomic_inc(&obt->obt_quotachecking);
-                return -EBUSY;
+        /* do not complain of being busy if we actually have nothing to do */
+        if (obt->obt_qfmt != version) {
+                if (obt->obt_qctxt.lqc_flags&(LQC_USRQUOTA_FLAG|LQC_GRPQUOTA_FLAG)){
+                        atomic_inc(&obt->obt_quotachecking);
+                        return -EBUSY;
+                }
+                obt->obt_qfmt = version;
         }
 
-        obt->obt_qfmt = version;
-
         atomic_inc(&obt->obt_quotachecking);
 
         return 0;

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 2d03202..b369f05 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -353,8 +353,11 @@ stop() {
 # set quota version (both administrative and operational quotas)
 quota_set_version() {
         do_facet mds "lctl set_param lquota.${FSNAME}-MDT*.quota_type=$1"
-        for j in `seq $OSTCOUNT`; do
-                do_facet ost$j "lctl set_param lquota.${FSNAME}-OST*.quota_type=$1"
+        local varsvc
+        local osts=$(get_facets OST)
+        for ost in ${osts//,/ }; do
+                varsvc=${ost}_svc
+                do_facet $ost "lctl set_param lquota.${!varsvc}.quota_type=$1"
         done
 }