From c12d0af2f98b246a73cc3ee027449a22192795b3 Mon Sep 17 00:00:00 2001 From: Jing Wenjun Date: Fri, 25 Nov 2016 21:31:22 +0800 Subject: [PATCH] rgw: metadata sync info should be shown at master zone of slave zonegroup When executing 'radosgw-admin sync status', the metadata sync info should be shown on the srceen at master zone of slave zonegroup. Using the function store->is_meta_master() instead of 'zonegroup.is_master && zone.id == zonegroup.master_zone' Fixes: http://tracker.ceph.com/issues/18091 Signed-off-by: Jing Wenjun --- src/rgw/rgw_admin.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index ab0b94d805b..93c70a053ac 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1975,7 +1975,7 @@ static void sync_status(Formatter *formatter) list md_status; - if (zone.id == zonegroup.master_zone) { + if (store->is_meta_master()) { md_status.push_back("no sync (zone is master)"); } else { get_md_sync_status(md_status); -- 2.39.5