From 608cce73d5149cb4d317ee189db94f0b6ade1ff5 Mon Sep 17 00:00:00 2001 From: Alexander Zarochentsev Date: Mon, 13 Sep 2021 08:46:58 +0300 Subject: [PATCH] LU-15007 tests: quota enable cmd fix the tunable should be osd-*.*.quota_slave.enabled not osd-*.*.quota_slave.enable. Fixes: b9c359a70d ("LU-7004 tests: move from lctl conf_param to lctl set_param -P") Test-Parameters: trivial testlist=ost-pools,sanity-quota HPE-bug-id: LUS-10413 Signed-off-by: Alexander Zarochentsev Change-Id: I321436520ab48eff4bcc93611a0ada68fa33205e Reviewed-on: https://review.whamcloud.com/44919 Tested-by: jenkins Reviewed-by: Andrew Perepechko Reviewed-by: Artem Blagodarenko Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/ost-pools.sh | 4 ++-- lustre/tests/sanity-quota.sh | 4 ++-- lustre/tests/test-framework.sh | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lustre/tests/ost-pools.sh b/lustre/tests/ost-pools.sh index 5c910e3..d99578b 100755 --- a/lustre/tests/ost-pools.sh +++ b/lustre/tests/ost-pools.sh @@ -1250,7 +1250,7 @@ test_23a() { else if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-OST*.quota_slave.enable=ug + osd-*.$FSNAME-OST*.quota_slave.enabled=ug else do_facet mgs $PERM_CMD $FSNAME.quota.ost=ug fi @@ -1325,7 +1325,7 @@ test_23b() { else if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-OST*.quota_slave.enable=none + osd-*.$FSNAME-OST*.quota_slave.enabled=none else do_facet mgs $PERM_CMD $FSNAME.quota.ost=none fi diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index a0c987d..11cdb5f 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -216,7 +216,7 @@ set_mdt_qtype() { if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-MDT*.quota_slave.enable=$qtype + osd-*.$FSNAME-MDT*.quota_slave.enabled=$qtype else do_facet mgs $PERM_CMD $FSNAME.quota.mdt=$qtype fi @@ -246,7 +246,7 @@ set_ost_qtype() { if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-OST*.quota_slave.enable=$qtype + osd-*.$FSNAME-OST*.quota_slave.enabled=$qtype else do_facet mgs $PERM_CMD $FSNAME.quota.ost=$qtype fi diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 6eb29a3..c507425 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -2205,7 +2205,7 @@ restore_quota() { if [ "$old_MDT_QUOTA_TYPE" ]; then if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-MDT*.quota_slave.enable = \ + osd-*.$FSNAME-MDT*.quota_slave.enabled = \ $old_MDT_QUOTA_TYPE else do_facet mgs $PERM_CMD \ @@ -2215,7 +2215,7 @@ restore_quota() { if [ "$old_OST_QUOTA_TYPE" ]; then if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-OST*.quota_slave.enable = \ + osd-*.$FSNAME-OST*.quota_slave.enabled = \ $old_OST_QUOTA_TYPE else do_facet mgs $LCTL conf_param \ @@ -2277,9 +2277,9 @@ setup_quota(){ if [[ $PERM_CMD == *"set_param -P"* ]]; then do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-MDT*.quota_slave.enable=$QUOTA_TYPE + osd-*.$FSNAME-MDT*.quota_slave.enabled=$QUOTA_TYPE do_facet mgs $PERM_CMD \ - osd-*.$FSNAME-OST*.quota_slave.enable=$QUOTA_TYPE + osd-*.$FSNAME-OST*.quota_slave.enabled=$QUOTA_TYPE else do_facet mgs $PERM_CMD $FSNAME.quota.mdt=$QUOTA_TYPE || error "set mdt quota type failed" -- 1.8.3.1