]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: set bucket attr twice when delete lifecycle config. 30862/head
authorzhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Fri, 11 Oct 2019 07:14:15 +0000 (15:14 +0800)
committerzhang shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 12 Feb 2020 07:53:01 +0000 (15:53 +0800)
Fixes: https://tracker.ceph.com/issues/44093
Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
src/rgw/rgw_op.cc

index 90279c1314a4fda5fdaf68fe917b541a84aad591..d094ebb00c0179585d6357751f82d73324d6cf79 100644 (file)
@@ -5514,16 +5514,6 @@ void RGWDeleteLC::execute()
       return;
     }
   }
-  map<string, bufferlist> 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) {