From dde61bcd3a015ae62818d521fdbca1b0bc5075f9 Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Sun, 21 Jan 2018 12:11:34 +0200 Subject: [PATCH] rgw: resharding needs to set back the bucket ACL after link Jewel only fix. New implementation of resharding in Luminous. Fixes: http://tracker.ceph.com/issues/22703 Signed-off-by: Orit Wasserman --- src/rgw/rgw_admin.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 2faf3c1eeec40..28d93fb299807 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -5121,7 +5121,7 @@ next: int num_target_shards = (new_bucket_info.num_shards > 0 ? new_bucket_info.num_shards : 1); BucketReshardManager target_shards_mgr(store, new_bucket_info, num_target_shards); - + if (verbose) { formatter->open_array_section("entries"); } @@ -5207,6 +5207,14 @@ next: cerr << "failed to link new bucket instance (bucket_id=" << new_bucket_info.bucket.bucket_id << ": " << err << "; " << cpp_strerror(-r) << std::endl; return -r; } + + r = rgw_bucket_set_attrs(store, new_bucket_info, attrs, &new_bucket_info.objv_tracker); + if (r < 0) { + cerr << "failed to reset attrs for bucket " << new_bucket_info.bucket.name << + " instance (bucket_id=" << new_bucket_info.bucket.bucket_id << ": " << err << "; " << cpp_strerror(-ret) + << ")" << std::endl; + } + } if (opt_cmd == OPT_OBJECT_UNLINK) { -- 2.39.5