From: Matt Benjamin <mbenjamin@redhat.com>
Date: Sat, 12 Oct 2024 22:20:31 +0000 (-0400)
Subject: rgw_cksum: return version_id in all cases
X-Git-Tag: v20.0.0~421^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1be4399edda33c381a727c51e1d232b3ea8f773b;p=ceph.git

rgw_cksum: return version_id in all cases

The version_id member in RGWGetObjAttrs shadows the one in
RGWGetObj.

Just assign it before conditionally returning the version-id header
in RGWGetObjAttrs_ObjStore_S3::send_response().

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index da02c5a6256c..234c26abbda2 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3865,6 +3865,8 @@ void RGWGetObjAttrs_ObjStore_S3::send_response()
   dump_errno(s);
 
   if (op_ret == 0) {
+    version_id = s->object->get_instance();
+
     // x-amz-delete-marker: DeleteMarker // not sure we can plausibly do this?
     dump_last_modified(s, lastmod);
     dump_header_if_nonempty(s, "x-amz-version-id", version_id);