Merge pull request #7633 from zaitcev/cleanup-various-1

rgw: cleanups to comments and messages

Reviewed-by: Orit Wasserman <owasserm@redhat.com>

src/rgw/rgw_admin.cc

@@ -120,6 +120,7 @@ void _usage()
   cout << "  orphans find               init and run search for leaked rados objects\n";
   cout << "  orphans finish             clean up search for leaked rados objects\n";
   cout << "options:\n";
+  cout << "   --tenant=<tenant>         tenant name\n";
   cout << "   --uid=<id>                user id\n";
   cout << "   --subuser=<name>          subuser name\n";
   cout << "   --access-key=<key>        S3 access key\n";
@@ -167,7 +168,7 @@ void _usage()
   cout << "   --show-log-sum=<flag>     enable/disable dump of log summation on log show\n";
   cout << "   --skip-zero-entries       log show only dumps entries that don't have zero value\n";
   cout << "                             in one of the numeric field\n";
-  cout << "   --infile                  specify a file to read in when setting data\n";
+  cout << "   --infile=<file>           specify a file to read in when setting data\n";
   cout << "   --state=<state string>    specify a state for the opstate set command\n";
   cout << "   --replica-log-type        replica log type (metadata, data, bucket), required for\n";
   cout << "                             replica log operations\n";
@@ -1866,7 +1867,7 @@ int main(int argc, char **argv)
   case OPT_CAPS_RM:
     ret = user.caps.remove(user_op, &err_msg);
     if (ret < 0) {
-      cerr << "could not add remove caps: " << err_msg << std::endl;
+      cerr << "could not remove caps: " << err_msg << std::endl;
       return -ret;
     }
 

src/rgw/rgw_rados.cc

@@ -3083,7 +3083,6 @@ int RGWRados::select_legacy_bucket_placement(const string& tenant_name, const st
   bucket.index_pool = pool_name;
 
   return 0;
-
 }
 
 int RGWRados::update_placement_map()
@@ -4549,7 +4548,7 @@ int RGWRados::delete_bucket(rgw_bucket& bucket, RGWObjVersionTracker& objv_track
   if (r < 0)
     return r;
 
-  /* if the bucked is not synced we can remove the meta file */
+  /* if the bucket is not synced we can remove the meta file */
   if (!is_syncing_bucket_meta(bucket)) {
     RGWObjVersionTracker objv_tracker;
     string entry;

src/test/cli/radosgw-admin/help.t

@@ -76,6 +76,7 @@
     orphans find               init and run search for leaked rados objects
     orphans finish             clean up search for leaked rados objects
   options:
+     --tenant=<tenant>         tenant name
      --uid=<id>                user id
      --subuser=<name>          subuser name
      --access-key=<key>        S3 access key
@@ -123,7 +124,7 @@
      --show-log-sum=<flag>     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
+     --infile=<file>           specify a file to read in when setting data
      --state=<state string>    specify a state for the opstate set command
      --replica-log-type        replica log type (metadata, data, bucket), required for
                                replica log operations

src/vstart.sh

@@ -126,7 +126,7 @@ usage=$usage"\t-d, --debug\n"
 usage=$usage"\t-s, --standby_mds: Generate standby-replay MDS for each active\n"
 usage=$usage"\t-l, --localhost: use localhost instead of hostname\n"
 usage=$usage"\t-i <ip>: bind to specific ip\n"
-usage=$usage"\t-r start radosgw (needs ceph compiled with --radosgw and apache2 with mod_fastcgi)\n"
+usage=$usage"\t-r start radosgw (needs ceph compiled with --radosgw)\n"
 usage=$usage"\t-n, --new\n"
 usage=$usage"\t--valgrind[_{osd,mds,mon}] 'toolname args...'\n"
 usage=$usage"\t--nodaemon: use ceph-run as wrapper for mon/osd/mds\n"