From: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Wed, 21 Nov 2018 06:58:27 +0000 (+0800)
Subject: rgw: fix compile error for appending object
X-Git-Tag: v14.1.1~144^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5197c69ee55fe26ef86a501d427aa41606545164;p=ceph.git

rgw: fix compile error for appending object

Signed-off-by: zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
---

diff --git a/doc/radosgw/s3/objectops.rst b/doc/radosgw/s3/objectops.rst
index d80b0887d54..3c8c8750a99 100644
--- a/doc/radosgw/s3/objectops.rst
+++ b/doc/radosgw/s3/objectops.rst
@@ -404,9 +404,9 @@ Syntax
 
 
 Append Object
-----------
+-------------
 Append data to an object. You must have write permissions on the bucket to perform this operation.
-It is used to upload files in appending mode.The type of the objects created by the Append Object
+It is used to upload files in appending mode. The type of the objects created by the Append Object
 operation is Appendable Object, and the type of the objects uploaded with the Put Object operation is Normal Object.
 **Append Object can't be used if bucket versioning is enabled.**
 
diff --git a/src/rgw/rgw_putobj_processor.cc b/src/rgw/rgw_putobj_processor.cc
index 4e10261a22d..365ad49d1ae 100644
--- a/src/rgw/rgw_putobj_processor.cc
+++ b/src/rgw/rgw_putobj_processor.cc
@@ -605,13 +605,13 @@ int AppendObjectProcessor::complete(size_t accounted_size, const string &etag, c
   if (r < 0) {
     return r;
   }
-  obj_ctx.obj.set_atomic(head_obj);
+  obj_ctx.set_atomic(head_obj);
   RGWRados::Object op_target(store, bucket_info, obj_ctx, head_obj);
   //For Append obj, disable versioning
   op_target.set_versioning_disabled(true);
   RGWRados::Object::Write obj_op(&op_target);
   if (cur_manifest) {
-    cur_manifest->append(manifest, store);
+    cur_manifest->append(manifest, store->svc.zone);
     obj_op.meta.manifest = cur_manifest;
   } else {
     obj_op.meta.manifest = &manifest;