rgw: cleanups to comments and messages

These are minor cleanups that do not affect the code in a
material way:
- Forgot to add --tenant to usage message
- Make the help slightly less misleading
- Fix a strange error message "could not add remove caps"
- Spelling in a comment
- The vstart.sh can be run with civetweb

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 115dc0aaceea4b309852b8f091a710bc70d6459a..885aca66305194515b269badc3ae8278ae44f9ce 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/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;
     }
 

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 17d109f73ddbeb95dbec452ec4a0bfe953fb3b9a..62b5f0e2ebff050d66fafcd329bdb4aaed27b37c 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3083,7 +3083,6 @@ read_omap:
   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;

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index 260de6d3fd85afe0d008bd31d966c2db4e39086d..51d1138d612c0a4ec2d98947808dc7827d9abe1a 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/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

diff --git a/src/vstart.sh b/src/vstart.sh
index 64c81fe5b318f42b0d5f0606123a559f48b22912..b714428fc81062e0b192b5ce5a58e5787bdf52ef 100755 (executable)
--- a/src/vstart.sh
+++ b/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"