From: Fan Yang <yangf@neunn.com>
Date: Mon, 3 Jul 2017 02:08:51 +0000 (+0800)
Subject: rgw: clean-up is_master_zonegroup() instead of is_meta_master()
X-Git-Tag: v12.1.1~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bbb557e89b975f1e47ba819e8f935a4f24a70d4;p=ceph.git

rgw: clean-up is_master_zonegroup() instead of is_meta_master()

Signed-off-by: Fan Yang <yangf@neunn.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 20eada8ed195..ac1bc44cc843 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5670,7 +5670,7 @@ bool RGWBulkDelete::Deleter::delete_single(const acct_path_t& path)
       goto delop_fail;
     }
 
-    if (!store->get_zonegroup().is_master_zonegroup()) {
+    if (!store->is_meta_master()) {
       bufferlist in_data;
       ret = forward_request_to_master(s, &ot.read_version, store, in_data,
                                       nullptr);