LU-15846 tests: don't use comma-separated debug flags

To avoid test interop issues between b_es6_0 clients and b_es5_2
servers, don't use comma-separated debug flags in sanity-quota.sh
quota_init() and quota_fini().

Lustre-change: https://review.whamcloud.com/47308
Lustre-commit: TBD (from 12282314e2567973b1a7cb4d6806e987bf1a6755)

Test-Parameters: trivial testlist=sanity-quota.sh serverversion=2.12.6-ddn66
Fixes: 6b6fde1026 ("LU-13055 libcfs: allow comma-separated masks")
Fixes: 78be823f33 ("LU-15218 quota: delete unused quota ID")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ifca39054d14292bca8bcff9b8e03ae58fd5cc3a8
Reviewed-on: https://review.whamcloud.com/47307
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index c96b6e5..4234e04 100755 (executable)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -477,7 +477,7 @@ reset_quota_settings() {
 # enable quota debug
 quota_init() {
        do_nodes $(comma_list $(nodes_list)) \
-               "$LCTL set_param -n debug=+quota,trace"
+               "$LCTL set_param -n debug=+quota+trace"
 }
 quota_init
 reset_quota_settings
@@ -3664,6 +3664,8 @@ test_delete_qid()
 
 test_48()
 {
+       (( "$MDS1_VERSION" >= $(version_code 2.14.0.38) )) ||
+               skip "Need MDS >= 2.14.0.18 to delete quota"
        setup_quota_test || error "setup quota failed with $?"
        set_ost_qtype $QTYPE || error "enable ost quota failed"
        quota_init
@@ -5208,7 +5210,7 @@ run_test 78 "Check fallocate increase quota usage"
 quota_fini()
 {
        do_nodes $(comma_list $(nodes_list)) \
-               "lctl set_param -n debug=-quota,trace"
+               "lctl set_param -n debug=-quota+trace"
        if $PQ_CLEANUP; then
                disable_project_quota
        fi