b=22386 quota_save_version() fix: remove wildcard from conf_param

i=Andrew.Perepechko

test_22 18 <-> 20 interop: skip quota v1 testing

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index dcbbf17..ee35501 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -1734,6 +1734,11 @@ test_21() {
 run_test_with_stat 21 "run for fixing bug16053 ==========="
 
 test_22() {
+        local lustre_version=$(get_lustre_version mds)
+        if [[ $lustre_version != 1.8* ]] ; then
+                skip mds running $lustre_version, skip quota v1 testing
+                return
+        fi
         quota_save_version "ug1"
 
         stopall

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 5e3a7d8..c46629a 100644 (file)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -448,7 +448,7 @@ quota_save_version() {
 
     [ -n "$type" ] && { $LFS quotacheck -$type $MOUNT || error "quotacheck has failed"; }
 
-    do_facet mgs "lctl conf_param ${FSNAME}-MDT*.md*.quota_type=$spec"
+    do_facet mgs "lctl conf_param ${FSNAME}-MDT*.$(get_md_name).quota_type=$spec"
     local varsvc
     local osts=$(get_facets OST)
     for ost in ${osts//,/ }; do
@@ -2804,6 +2804,16 @@ get_mds_mdt_device_proc_path() {
     fi
 }
 
+get_md_name () {
+    local major=$(get_mds_version_major)
+    local minor=$(get_mds_version_minor)
+    if [ $major -le 1 -a $minor -le 8 ] ; then
+        echo "mdt"
+    else
+        echo "mdd"
+    fi
+}
+
 ########################
 
 convert_facet2label() {