diff options
| author | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-30 13:53:53 -0700 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-07-30 16:03:12 -0700 |
| commit | 736d6a1bde71919f7469218684c12793a9532aeb (patch) | |
| tree | c31011da94879c2b3dc4706ce73abbd04bae70e0 | |
| parent | 0e125e0e86c920218b97716addf1db89bcd93b0c (diff) | |
| download | ceph-736d6a1bde71919f7469218684c12793a9532aeb.tar.gz | |
rgw: fix set_buckets_enabled(), set_bucket_owner()
Fixes: 5808
We cannot call get_bucket_instance_info() at that point,
as the bucket structure wasn't initialized, so we don't
have the bucket instance location information. Just calling
get_bucket_info().
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/rgw/rgw_rados.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 7131df9eaeb..aba5cdf0ee2 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -2907,7 +2907,7 @@ int RGWRados::set_bucket_owner(rgw_bucket& bucket, ACLOwner& owner) { RGWBucketInfo info; map<string, bufferlist> attrs; - int r = get_bucket_instance_info(NULL, bucket, info, NULL, &attrs); + int r = get_bucket_info(NULL, bucket.name, info, NULL, &attrs); if (r < 0) { ldout(cct, 0) << "NOTICE: get_bucket_info on bucket=" << bucket.name << " returned err=" << r << dendl; return r; @@ -2940,7 +2940,7 @@ int RGWRados::set_buckets_enabled(vector<rgw_bucket>& buckets, bool enabled) RGWBucketInfo info; map<string, bufferlist> attrs; - int r = get_bucket_instance_info(NULL, bucket, info, NULL, &attrs); + int r = get_bucket_info(NULL, bucket.name, info, NULL, &attrs); if (r < 0) { ldout(cct, 0) << "NOTICE: get_bucket_info on bucket=" << bucket.name << " returned err=" << r << ", skipping bucket" << dendl; ret = r; |