]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
radosgw-admin: fix zone get command
authorOrit Wasserman <owasserm@redhat.com>
Thu, 22 Oct 2015 12:58:51 +0000 (14:58 +0200)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:18 +0000 (16:13 -0800)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
src/rgw/rgw_admin.cc

index fb865aa0b00e534bddbfa742762d2c1147a1a03a..6d7923581de4445cbec832c498810465bf3269d4 100644 (file)
@@ -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;