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>

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 7d1c3aa2cb0e9ebd0404e2e4a880f5430ffdfc6f..60d3e81ea745998bf1adf7e0998114866720bb17 100644 (file)
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -216,9 +216,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
index af003c7f6a9dce061f58279166a209a44aec216c..8d48499c7322865f13b405f378de674a4d5c6409 100644 (file)
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -3722,7 +3722,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
index 15aaa6ccbe1e7c3f4671f04606a45faed2304e15..e595db55cecf51e5f7476de43713127d93674c7d 100644 (file)
--- a/src/test/cli/radosgw-admin/help.t
+++ b/src/test/cli/radosgw-admin/help.t
@@ -167,9 +167,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