From db4f65a71dde4c85e3d9266e9accca987e01b313 Mon Sep 17 00:00:00 2001 From: Gui Hecheng Date: Wed, 14 Jun 2017 15:03:36 +0800 Subject: [PATCH] rgw_file: fix assert upon setattr on bucket Fixes: http://tracker.ceph.com/issues/20287 Signed-off-by: Gui Hecheng --- src/rgw/rgw_op.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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) { -- 2.47.3