From: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Fri, 11 Oct 2019 07:14:15 +0000 (+0800)
Subject: rgw: set bucket attr twice when delete lifecycle config.
X-Git-Tag: v14.2.10~127^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=126d0b15719f2199ccbe4e63c568d6f468fccc68;p=ceph.git

rgw: set bucket attr twice when delete lifecycle config.

Fixes: https://tracker.ceph.com/issues/44093

Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
(cherry picked from commit c480b029f205c417935df2478a6aa66211f13658)

Conflicts:
	src/rgw/rgw_op.cc
- set_bucket_instance_attrs call looks different in nautilus, presumably
  due to post-nautilus refactoring
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 2f3e92671216..c6033823dd41 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -5437,15 +5437,6 @@ void RGWDeleteLC::execute()
       return;
     }
   }
-  map<string, bufferlist> attrs = s->bucket_attrs;
-  attrs.erase(RGW_ATTR_LC);
-  op_ret = rgw_bucket_set_attrs(store, s->bucket_info, attrs,
-				&s->bucket_info.objv_tracker);
-  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->get_lc()->remove_bucket_config(s->bucket_info, s->bucket_attrs);
   if (op_ret < 0) {