From: Gui Hecheng <guihecheng@cmss.chinamobile.com>
Date: Wed, 14 Jun 2017 07:03:36 +0000 (+0800)
Subject: rgw_file: fix assert upon setattr on bucket
X-Git-Tag: v12.1.0~70^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db4f65a71dde4c85e3d9266e9accca987e01b313;p=ceph.git

rgw_file: fix assert upon setattr on bucket

Fixes: http://tracker.ceph.com/issues/20287

Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 7005490d4a43..aa5b0dbfce7d 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6259,9 +6259,8 @@ void RGWSetAttrs::execute()
 
   rgw_obj obj(s->bucket, s->object);
 
-  store->set_atomic(s->obj_ctx, obj);
-
   if (!s->object.empty()) {
+    store->set_atomic(s->obj_ctx, obj);
     op_ret = store->set_attrs(s->obj_ctx, s->bucket_info, obj, attrs, nullptr);
   } else {
     for (auto& iter : attrs) {