From 9ab5fd9d67da43e986489e4f580a597dd8cb551e Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 1 Feb 2016 16:33:55 -0800 Subject: [PATCH] rgw-admin: document orphans commands in usage Fixes: #14516 Signed-off-by: Yehuda Sadeh (cherry picked from commit 105a76bf542e05b739d5a03ca8ae55432350f107) Conflicts: src/rgw/rgw_admin.cc (trivial resolution) --- src/rgw/rgw_admin.cc | 5 +++++ src/test/cli/radosgw-admin/help.t | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 45cb2e197edd..2ba77e336973 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -112,6 +112,8 @@ void _usage() cerr << " replicalog get get replica metadata log entry\n"; cerr << " replicalog update update replica metadata log entry\n"; cerr << " replicalog delete delete replica metadata log entry\n"; + cout << " orphans find init and run search for leaked rados objects\n"; + cout << " orphans finish clean up search for leaked rados objects\n"; cerr << "options:\n"; cerr << " --uid= user id\n"; cerr << " --subuser= subuser name\n"; @@ -174,6 +176,9 @@ void _usage() cerr << " --max-objects specify max objects (negative value to disable)\n"; cerr << " --max-size specify max size (in bytes, negative value to disable)\n"; cerr << " --quota-scope scope of quota (bucket, user)\n"; + cout << "\nOrphans search options:\n"; + cout << " --pool data pool to scan for leaked rados objects in\n"; + cout << " --num-shards num of shards to use for keeping the temporary scan info\n"; cerr << "\n"; generic_client_usage(); } diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t index bdb7324b77af..a294549409c0 100644 --- a/src/test/cli/radosgw-admin/help.t +++ b/src/test/cli/radosgw-admin/help.t @@ -69,6 +69,8 @@ replicalog get get replica metadata log entry replicalog update update replica metadata log entry replicalog delete delete replica metadata log entry + orphans find init and run search for leaked rados objects + orphans finish clean up search for leaked rados objects options: --uid= user id --subuser= subuser name @@ -132,6 +134,10 @@ --max-size specify max size (in bytes, negative value to disable) --quota-scope scope of quota (bucket, user) + Orphans search options: + --pool data pool to scan for leaked rados objects in + --num-shards num of shards to use for keeping the temporary scan info + --conf/-c FILE read configuration from the given configuration file --id/-i ID set ID portion of my name --name/-n TYPE.ID set name -- 2.47.3