From c480b029f205c417935df2478a6aa66211f13658 Mon Sep 17 00:00:00 2001 From: zhang Shaowen Date: Fri, 11 Oct 2019 15:14:15 +0800 Subject: [PATCH] rgw: set bucket attr twice when delete lifecycle config. Fixes: https://tracker.ceph.com/issues/44093 Signed-off-by: zhang Shaowen --- src/rgw/rgw_op.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 90279c1314a4f..d094ebb00c017 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -5514,16 +5514,6 @@ void RGWDeleteLC::execute() return; } } - map attrs = s->bucket_attrs; - attrs.erase(RGW_ATTR_LC); - op_ret = store->ctl()->bucket->set_bucket_instance_attrs(s->bucket_info, attrs, - &s->bucket_info.objv_tracker, - s->yield); - if (op_ret < 0) { - ldpp_dout(this, 0) << "RGWLC::RGWDeleteLC() failed to set attrs on bucket=" - << s->bucket.name << " returned err=" << op_ret << dendl; - return; - } op_ret = store->getRados()->get_lc()->remove_bucket_config(s->bucket_info, s->bucket_attrs); if (op_ret < 0) { -- 2.39.5