From db6647d03346ef18aa4ddceee7fa365d1f3e0d8a Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Thu, 22 Oct 2015 14:58:51 +0200 Subject: [PATCH] radosgw-admin: fix zone get command Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index fb865aa0b00e5..6d7923581de44 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -2627,16 +2627,8 @@ int main(int argc, char **argv) break; case OPT_ZONE_GET: { - RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); - int ret; - if (!zonegroup_id.empty() || !zonegroup_name.empty()) { - ret = zonegroup.init(g_ceph_context, store); - if (ret < 0) { - cerr << "WARNING: failed to initialize zonegroup" << std::endl; - } - } - RGWZoneParams zone; - ret = zone.init(g_ceph_context, store); + RGWZoneParams zone(zone_id, zone_name); + int ret = zone.init(g_ceph_context, store); if (ret < 0) { cerr << "unable to initialize zone: " << cpp_strerror(-ret) << std::endl; return -ret; -- 2.39.5