From 8b9cd6685898f90cbd0c555aabcd4eb9b764a211 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 1 Dec 2015 13:35:15 -0800 Subject: [PATCH] rgw: forward bucket creation removal if it's not meta master We can be in the master zonegroup, but not the meta master -- in which case we still need to forward the request to the master. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index b6b55753f5402..e3677f1a7916e 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -1764,7 +1764,7 @@ void RGWCreateBucket::execute() rgw_bucket *pmaster_bucket; time_t creation_time; - if (!store->get_zonegroup().is_master) { + if (!store->is_meta_master()) { JSONParser jp; op_ret = forward_request_to_master(s, NULL, store, in_data, &jp); if (op_ret < 0) @@ -1917,7 +1917,7 @@ void RGWDeleteBucket::execute() return; } - if (!store->get_zonegroup().is_master) { + if (!store->is_meta_master()) { bufferlist in_data; JSONParser jp; op_ret = forward_request_to_master(s, &ot.read_version, store, in_data, -- 2.39.5