From 9f0e461ce33808496e1df5c0706ed8b4403b7109 Mon Sep 17 00:00:00 2001 From: jiahuizeng Date: Thu, 24 Oct 2019 11:32:38 +0800 Subject: [PATCH] rgw: fix radosgw-admin zone/zonegroup placement get command Signed-off-by: jiahuizeng --- src/rgw/rgw_admin.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index f84955f78559..2e811d1a04bf 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -4312,7 +4312,7 @@ int main(int argc, const char **argv) } RGWZoneGroup zonegroup(zonegroup_id, zonegroup_name); - int ret = zonegroup.init(g_ceph_context, store); + int ret = zonegroup.init(g_ceph_context, store->svc()->sysobj); if (ret < 0) { cerr << "failed to init zonegroup: " << cpp_strerror(-ret) << std::endl; return -ret; @@ -4325,7 +4325,6 @@ int main(int argc, const char **argv) } encode_json("placement_targets", p->second, formatter); formatter->flush(cout); - cout << std::endl; } break; case OPT_ZONEGROUP_PLACEMENT_ADD: @@ -4912,7 +4911,7 @@ int main(int argc, const char **argv) } RGWZoneParams zone(zone_id, zone_name); - int ret = zone.init(g_ceph_context, store); + int ret = zone.init(g_ceph_context, store->svc()->sysobj); if (ret < 0) { cerr << "unable to initialize zone: " << cpp_strerror(-ret) << std::endl; return -ret; -- 2.47.3