From: jiahuizeng <jhzeng93@foxmail.com>
Date: Thu, 24 Oct 2019 03:32:38 +0000 (+0800)
Subject: rgw: fix radosgw-admin zone/zonegroup placement get command
X-Git-Tag: v14.2.8~78^2~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed207a143a099c13ea7c99e031532f1fc77b7dee;p=ceph.git

rgw: fix radosgw-admin zone/zonegroup placement get command

Signed-off-by: jiahuizeng <jhzeng93@foxmail.com>
(cherry picked from commit 9f0e461ce33808496e1df5c0706ed8b4403b7109)

Conflicts:
    src/rgw/rgw_admin.cc
- nautilus uses "store->svc.sysobj"
---

diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 5a191d3b3429..667aa4220dec 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -4340,7 +4340,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;
@@ -4353,7 +4353,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:
@@ -4940,7 +4939,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;