From 86fb064f0b2e166d7ecbecdd5d06e1ec3620c372 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Tue, 30 Jul 2013 13:53:53 -0700 Subject: rgw: fix set_buckets_enabled(), set_bucket_owner() Fixes: 5808 We cannit call put_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 put_bucket_info(). Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rados.cc | 4 ++-- 1 file 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 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& buckets, bool enabled) RGWBucketInfo info; map 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; -- cgit v1.2.1