From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 25 May 2017 00:00:02 +0000 (-0700)
Subject: rgw-admin: radosgw-admin reshard execute -> reshard process
X-Git-Tag: ses5-milestone6~8^2~7^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6dc81cf4fd145c7e811a65e911207218ef0d9d4;p=ceph.git

rgw-admin: radosgw-admin reshard execute -> reshard process

to be in line with other radosgw-admin commands.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index c3400bcc116c2..aa3ce9e1b23c0 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -192,7 +192,7 @@ void _usage()
   cout << "  role-policy delete         delete policy attached to a role\n";
   cout << "  reshard add                schedule a resharding of a bucket\n";
   cout << "  reshard list               list all bucket resharding or scheduled to be reshared\n";
-  cout << "  reshard execute            execute resharding of  a bucket \n";
+  cout << "  reshard process            process of scheduled reshard jobs\n";
   cout << "  reshard cancel             cancel resharding a bucket\n";
   cout << "options:\n";
   cout << "   --tenant=<tenant>         tenant name\n";
@@ -483,7 +483,7 @@ enum {
   OPT_RESHARD_ADD,
   OPT_RESHARD_LIST,
   OPT_RESHARD_STATUS,
-  OPT_RESHARD_EXECUTE,
+  OPT_RESHARD_PROCESS,
   OPT_RESHARD_CANCEL,
 };
 
@@ -926,7 +926,7 @@ static int get_cmd(const char *cmd, const char *prev_cmd, const char *prev_prev_
     if (strcmp(cmd, "status") == 0)
       return OPT_RESHARD_STATUS;
     if (strcmp(cmd, "execute") == 0)
-      return OPT_RESHARD_EXECUTE;
+      return OPT_RESHARD_PROCESS;
     if (strcmp(cmd, "cancel") == 0)
       return OPT_RESHARD_CANCEL;
   }
@@ -5703,7 +5703,7 @@ next:
     formatter->flush(cout);
   }
 
-  if (opt_cmd == OPT_RESHARD_EXECUTE) {
+  if (opt_cmd == OPT_RESHARD_PROCESS) {
     RGWReshard reshard(store, true, &cout);
 
     int ret = reshard.process_all_logshards();