From 997c6f4e952c8f274bcc3e5be56c130fa91a8a76 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 10 Jul 2013 10:08:07 -0700 Subject: [PATCH] rgw-admin: add some of the newer flags and specify their use Signed-off-by: Greg Farnum --- src/rgw/rgw_admin.cc | 10 ++++++---- src/test/cli/radosgw-admin/help.t | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 5a09887e8cc..d7367521b0c 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -64,12 +64,12 @@ void _usage() cerr << " object unlink unlink object from bucket index\n"; cerr << " region get show region info\n"; cerr << " regions list list all regions set on this cluster\n"; - cerr << " region set set region info\n"; + cerr << " region set set region info (requires infile)\n"; cerr << " region default set default region\n"; cerr << " region-map get show region-map\n"; - cerr << " region-map set set region-map\n"; + cerr << " region-map set set region-map (requires infile)\n"; cerr << " zone get show zone cluster params\n"; - cerr << " zone set set zone cluster params\n"; + cerr << " zone set set zone cluster params (requires infile)\n"; cerr << " zone list list all zones set on this cluster\n"; cerr << " pool add add an existing pool for data placement\n"; cerr << " pool rm remove an existing pool from data placement set\n"; @@ -97,7 +97,7 @@ void _usage() cerr << " datalog trim trim data log\n"; cerr << " opstate list list stateful operations entries (use client_id,\n"; cerr << " op_id, object)\n"; - cerr << " opstate set set state on an entry (use client_id, op_id, object)\n"; + cerr << " opstate set set state on an entry (use client_id, op_id, object, state)\n"; cerr << " opstate renew renew state on an entry (use client_id, op_id, object)\n"; cerr << " opstate rm remove entry (use client_id, op_id, object)\n"; cerr << " replicalog get get replica metadata log entry\n"; @@ -141,6 +141,8 @@ void _usage() cerr << " --show-log-sum= enable/disable dump of log summation on log show\n"; cerr << " --skip-zero-entries log show only dumps entries that don't have zero value\n"; cerr << " in one of the numeric field\n"; + cerr << " --infile specify a file to read in when setting data\n"; + cerr << " --state= specify a state for the opstate set command\n"; cerr << " --replica-log-type replica log type (metadata, data, bucket), required for\n"; cerr << " replica log operations\n"; cerr << " --categories= comma separated list of categories, used in usage show\n"; diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index d263b22bafb..ba77e7b86c2 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -25,12 +25,12 @@ object unlink unlink object from bucket index region get show region info regions list list all regions set on this cluster - region set set region info + region set set region info (requires infile) region default set default region region-map get show region-map - region-map set set region-map + region-map set set region-map (requires infile) zone get show zone cluster params - zone set set zone cluster params + zone set set zone cluster params (requires infile) zone list list all zones set on this cluster pool add add an existing pool for data placement pool rm remove an existing pool from data placement set @@ -58,7 +58,7 @@ datalog trim trim data log opstate list list stateful operations entries (use client_id, op_id, object) - opstate set set state on an entry (use client_id, op_id, object) + opstate set set state on an entry (use client_id, op_id, object, state) opstate renew renew state on an entry (use client_id, op_id, object) opstate rm remove entry (use client_id, op_id, object) replicalog get get replica metadata log entry @@ -102,6 +102,8 @@ --show-log-sum= enable/disable dump of log summation on log show --skip-zero-entries log show only dumps entries that don't have zero value in one of the numeric field + --infile specify a file to read in when setting data + --state= specify a state for the opstate set command --replica-log-type replica log type (metadata, data, bucket), required for replica log operations --categories= comma separated list of categories, used in usage show -- 2.47.3