]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: forward bucket creation removal if it's not meta master
authorYehuda Sadeh <yehuda@redhat.com>
Tue, 1 Dec 2015 21:35:15 +0000 (13:35 -0800)
committerYehuda Sadeh <yehuda@redhat.com>
Fri, 12 Feb 2016 00:13:40 +0000 (16:13 -0800)
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 <yehuda@redhat.com>
src/rgw/rgw_op.cc

index b6b55753f540284440ce8e3c3fc6552fccc797f8..e3677f1a7916ebf732561bae5e554ce24342a123 100644 (file)
@@ -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,