rgw: add data sync related cmd into radosgw-admin help info

+ radosgw-admin data sync status
+ radosgw-admin data sync init
+ radosgw-admin data sync run

Signed-off-by: lvshanchun <lvshanchun@gmail.com>

diff --git a/doc/man/8/radosgw-admin.rst b/doc/man/8/radosgw-admin.rst
index 4d27b0a42be9d339be0ba7ada962bbe39cffba64..edbf883ff70257471786463269f4618aba9ad1dc 100644 (file)
--- a/doc/man/8/radosgw-admin.rst
+++ b/doc/man/8/radosgw-admin.rst
@@ -140,6 +140,15 @@ which are as follows:
 :command:`metadata sync run`
   Run metadata sync.
 
+:command:`data sync status`
+  Get data sync status of the specified source zone.
+  
+:command:`data sync init`
+  Init data sync for the specified source zone.
+
+:command:`data sync run`
+  Run data sync for the specified source zone.
+
 :command:`pool add`
   Add an existing pool for data placement.
 
@@ -354,6 +363,10 @@ Options
 
        Zone in which radosgw is running.
 
+.. option:: --source-zone=<zone>
+
+  Specify the source zone for data sync.
+
 .. option:: --fix
 
        Besides checking bucket index, will also fix it.

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index a750a9950d5b1e359f750904dbf6f0f2502e518e..fc8ed5f91203a7cfa01276542841abcb6ffc063f 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -146,6 +146,9 @@ void usage()
   cout << "  metadata sync status       get metadata sync status\n";
   cout << "  metadata sync init         init metadata sync\n";
   cout << "  metadata sync run          run metadata sync\n";
+  cout << "  data sync status           get data sync status of the specified source zone\n";
+  cout << "  data sync init             init data sync for the specified source zone\n";
+  cout << "  data sync run              run data sync for the specified source zone\n";
   cout << "  pool add                   add an existing pool for data placement\n";
   cout << "  pool rm                    remove an existing pool from data placement set\n";
   cout << "  pools list                 list placement active set\n";

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
index cb4c4ae9cecee2ffe58740cdf87a340b5c33e3ed..f14f6c6534154ee13dca140fc2fba9cc55fce5e5 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -89,6 +89,9 @@
     metadata sync status       get metadata sync status
     metadata sync init         init metadata sync
     metadata sync run          run metadata sync
+    data sync status           get data sync status of the specified source zone
+    data sync init             init data sync for the specified source zone
+    data sync run              run data sync for the specified source zone
     pool add                   add an existing pool for data placement
     pool rm                    remove an existing pool from data placement set
     pools list                 list placement active set