]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: CompleteMultipart applies its olh_epoch
authorCasey Bodley <cbodley@redhat.com>
Fri, 1 Jun 2018 16:37:36 +0000 (12:37 -0400)
committerNathan Cutler <ncutler@suse.com>
Wed, 12 Sep 2018 16:15:29 +0000 (18:15 +0200)
RGWCompleteMultipart was using get_system_versioning_params() to read an
olh_epoch, but was never applying it to the bucket index operation

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit e4d1cc1204dd588a6cdbb70b0b48403a97302412)

src/rgw/rgw_op.cc

index d186e2e1a9c48e547ef0b883cb663b86a28304cd..83b9439fa59947a9f470b456122817d28b2996ba 100644 (file)
@@ -5622,6 +5622,7 @@ void RGWCompleteMultipart::execute()
   obj_op.meta.flags = PUT_OBJ_CREATE;
   obj_op.meta.modify_tail = true;
   obj_op.meta.completeMultipart = true;
+  obj_op.meta.olh_epoch = olh_epoch;
   op_ret = obj_op.write_meta(ofs, accounted_size, attrs);
   if (op_ret < 0)
     return;