rgw: setting sync-from zone by name not by id

Using the zone name is easier and clearer. Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
ceph · Aug 26, 2016 · 96a970d · 96a970d
1 parent 5244e05
commit 96a970d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
@@ -217,9 +217,9 @@ void _usage()
   cout << "                             unset zone tier config keys\n";
   cout << "   --tier_type=<type>        zone tier type\n";
   cout << "   --sync-from-all[=false]   set/reset whether zone syncs from all zonegroup peers\n";
-  cout << "   --sync-from=[zone-id][,...]\n";
+  cout << "   --sync-from=[zone-name][,...]\n";
   cout << "                             set list of zones to sync from\n";
-  cout << "   --sync-from-rm=[zone-id][,...]\n";
+  cout << "   --sync-from-rm=[zone-name][,...]\n";
   cout << "                             remove zones from list of zones to sync from\n";
   cout << "   --fix                     besides checking bucket index, will also fix it\n";
   cout << "   --check-objects           bucket check: rebuilds bucket index according to\n";

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
@@ -3656,7 +3656,7 @@ int RGWRados::init_zg_from_local(bool *creating_defaults)
 
 bool RGWRados::zone_syncs_from(RGWZone& target_zone, RGWZone& source_zone)
 {
-  return target_zone.syncs_from(source_zone.id) &&
+  return target_zone.syncs_from(source_zone.name) &&
          sync_modules_manager->supports_data_export(source_zone.tier_type);
 }
 

diff --git a/src/test/cli/radosgw-admin/help.t b/src/test/cli/radosgw-admin/help.t
@@ -168,9 +168,9 @@
                                unset zone tier config keys
      --tier_type=<type>        zone tier type
      --sync-from-all[=false]   set/reset whether zone syncs from all zonegroup peers
-     --sync-from=[zone-id][,...]
+     --sync-from=[zone-name][,...]
                                set list of zones to sync from
-     --sync-from-rm=[zone-id][,...]
+     --sync-from-rm=[zone-name][,...]
                                remove zones from list of zones to sync from
      --fix                     besides checking bucket index, will also fix it
      --check-objects           bucket check: rebuilds bucket index according to