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

To avoid test interop issues between 2.15 clients and 2.12/2.14
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: fe8315c25ed093d77a6f366e2a4849aba008b680

Test-Parameters: trivial testlist=sanity-quota env=ONLY=48 serverversion=2.14.0
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/c/fs/lustre-release/+/57100
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sarah Liu <sarah@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index 0c3c4fe..c0368a1 100755 (executable)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -492,7 +492,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
@@ -3793,6 +3793,9 @@ test_delete_qid()
 
 test_48()
 {
+       (( MDS1_VERSION >= $(version_code 2.14.57.68) )) ||
+               skip "need MDS >= v2_14_57-68-g78be823f3339 to delete quota"
+
        setup_quota_test || error "setup quota failed with $?"
        set_ost_qtype $QTYPE || error "enable ost quota failed"
        quota_init
@@ -5600,7 +5603,7 @@ run_test 82 "verify more than 8 qids for single operation"
 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