Merge pull request ceph#65398 from smanjara/wip-fix-zg-api-name

smanjara · web-flow · commit cb24ff75f1bb · 2025-09-18T09:20:50.000-07:00
rgw/multisite: update api_name during a zonegroup rename
diff --git a/src/rgw/radosgw-admin/radosgw-admin.cc b/src/rgw/radosgw-admin/radosgw-admin.cc
@@ -5902,6 +5902,7 @@ int main(int argc, const char **argv)
 	  cerr << "failed to load zonegroup: " << cpp_strerror(-ret) << std::endl;
 	  return -ret;
 	}
+        zonegroup.api_name = zonegroup_new_name;
         ret = writer->rename(dpp(), null_yield, zonegroup, zonegroup_new_name);
 	if (ret < 0) {
 	  cerr << "failed to rename zonegroup: " << cpp_strerror(-ret) << std::endl;

Original file line number	Diff line number	Diff line change
`@@ -5902,6 +5902,7 @@ int main(int argc, const char **argv)`
`5902`	`5902`	`cerr << "failed to load zonegroup: " << cpp_strerror(-ret) << std::endl;`
`5903`	`5903`	`return -ret;`
`5904`	`5904`	`}`
	`5905`	`+ zonegroup.api_name = zonegroup_new_name;`
`5905`	`5906`	`ret = writer->rename(dpp(), null_yield, zonegroup, zonegroup_new_name);`
`5906`	`5907`	`if (ret < 0) {`
`5907`	`5908`	`cerr << "failed to rename zonegroup: " << cpp_strerror(-ret) << std::endl;`