From: Abhishek Lekshmanan <abhishek@suse.com>
Date: Fri, 1 Apr 2016 11:46:30 +0000 (+0200)
Subject: rgw_admin: improve the orphans find help
X-Git-Tag: v0.94.10~67^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=34ecb3584230db8458f193ac01deff9264cd119a;p=ceph.git

rgw_admin: improve the orphans find help

Adding  a few missing commandline switches and improve the help message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit 27e4c46f741a5f908d5c8ca1af227b3581c697f6)
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 60051482ef57..cb6a2c7060d1 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -112,7 +112,7 @@ 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";
-  cerr << "  orphans find               init and run search for leaked rados objects\n";
+  cerr << "  orphans find               init and run search for leaked rados objects (use job-id, pool)\n";
   cerr << "  orphans finish             clean up search for leaked rados objects\n";
   cerr << "options:\n";
   cerr << "   --uid=<id>                user id\n";
@@ -183,6 +183,8 @@ void _usage()
   cerr << "\nOrphans search options:\n";
   cerr << "   --pool                    data pool to scan for leaked rados objects in\n";
   cerr << "   --num-shards              num of shards to use for keeping the temporary scan info\n";
+  cerr << "   --job-id                  set the job id (for orphans find)\n";
+  cerr << "   --max-concurrent-ios      maximum concurrent ios for orphans find (default: 32)\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 dde20f8ca82b..060e92edd397 100644
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -69,7 +69,7 @@
     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 find               init and run search for leaked rados objects (use job-id, pool)
     orphans finish             clean up search for leaked rados objects
   options:
      --uid=<id>                user id
@@ -142,6 +142,8 @@
   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
+     --job-id                  set the job id (for orphans find)
+     --max-concurrent-ios      maximum concurrent ios for orphans find (default: 32)
   
     --conf/-c FILE    read configuration from the given configuration file
     --id/-i ID        set ID portion of my name