From 6728e670659d49318bbd57140c98f5b204e14b87 Mon Sep 17 00:00:00 2001 From: Jiaying Ren Date: Tue, 18 Jul 2017 13:56:30 +0800 Subject: [PATCH] test,rgw: fix rgw placement rule pool config option actually we're checking '--index-pool' & `--max-buckets` during the argument parsing. same as 3af3f4e84ca226f63f7491eb64195d07419a3e1e Signed-off-by: Jiaying Ren jiaying.ren@umcloud.com --- src/rgw/rgw_admin.cc | 4 ++-- src/test/cli/radosgw-admin/help.t | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index e6ebee60c3118..1be1d1594ed36 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -209,7 +209,7 @@ void _usage() cout << " --access= Set access permissions for sub-user, should be one\n"; cout << " of read, write, readwrite, full\n"; cout << " --display-name=\n"; - cout << " --max_buckets max number of buckets for a user\n"; + cout << " --max-buckets max number of buckets for a user\n"; cout << " --admin set the admin flag on the user\n"; cout << " --system set the system flag on the user\n"; cout << " --bucket=\n"; @@ -252,7 +252,7 @@ void _usage() cout << " --tags-add= list of tags to add for zonegroup placement modify command\n"; cout << " --tags-rm= list of tags to remove for zonegroup placement modify command\n"; cout << " --endpoints= zone endpoints\n"; - cout << " --index_pool= placement target index pool\n"; + cout << " --index-pool= placement target index pool\n"; cout << " --data-pool= placement target data pool\n"; cout << " --data-extra-pool= placement target data extra (non-ec) pool\n"; cout << " --placement-index-type=\n"; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index d339b09480e5f..4cdd323118841 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -153,7 +153,7 @@ --access= Set access permissions for sub-user, should be one of read, write, readwrite, full --display-name= - --max_buckets max number of buckets for a user + --max-buckets max number of buckets for a user --admin set the admin flag on the user --system set the system flag on the user --bucket= @@ -196,7 +196,7 @@ --tags-add= list of tags to add for zonegroup placement modify command --tags-rm= list of tags to remove for zonegroup placement modify command --endpoints= zone endpoints - --index_pool= placement target index pool + --index-pool= placement target index pool --data-pool= placement target data pool --data-extra-pool= placement target data extra (non-ec) pool --placement-index-type= -- 2.39.5