diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-27 01:12:49 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-29 10:58:30 -0700 |
| commit | 4435bc54fc0045d058d2a0d2e23354c19ffeb732 (patch) | |
| tree | 795c1ebdd5065d62476211279243cb659142dd3e | |
| parent | 2e8cbb7312466b1deb928f53f2199474cfaaa8ac (diff) | |
| download | ceph-wip-5770.tar.gz | |
rgw: set bucket attrs are a bucket instance meta operationwip-5770
Need to do the action through the bucket instance handler
and not through the bucket handler, otherwise it's wrongly
recorded (and wrongly replayed, ouch).
Fixes: #5791
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| -rw-r--r-- | src/rgw/rgw_bucket.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rgw/rgw_bucket.cc b/src/rgw/rgw_bucket.cc index bf8da99d616..22eff71032e 100644 --- a/src/rgw/rgw_bucket.cc +++ b/src/rgw/rgw_bucket.cc @@ -202,7 +202,10 @@ int rgw_bucket_set_attrs(RGWRados *store, rgw_bucket& bucket, string oid; store->get_bucket_meta_oid(bucket, oid); rgw_obj obj(store->zone.domain_root, oid); - return store->meta_mgr->set_attrs(bucket_meta_handler, oid, + + string key; + store->get_bucket_instance_entry(bucket, key); /* when we go through meta api, we don't use oid directly */ + return store->meta_mgr->set_attrs(bucket_instance_meta_handler, key, obj, attrs, rmattrs, objv_tracker); } |