From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 1 Jun 2018 16:37:36 +0000 (-0400)
Subject: rgw: CompleteMultipart applies its olh_epoch
X-Git-Tag: v12.2.9~85^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6df5055b352bcdd7535b3c9633b809f66f1a806;p=ceph.git

rgw: CompleteMultipart applies its olh_epoch

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)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index d186e2e1a9c4..83b9439fa599 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -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;