From a088cb44952b382c9a40c762914acdd69aa61c57 Mon Sep 17 00:00:00 2001 From: Huber-ming Date: Thu, 12 May 2022 15:09:15 +0800 Subject: [PATCH] rgw: check object storage_class when check_disk_state fix: https://tracker.ceph.com/issues/55618 Signed-off-by: Huber-ming (cherry picked from commit 4a2e553b5d9621bf346185155588560a3960a5c1) --- src/rgw/rgw_rados.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index a27db1224fac..bc6c34e68bff 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -9154,6 +9154,7 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp, string etag; string content_type; + string storage_class; ACLOwner owner; object.meta.size = astate->size; @@ -9168,6 +9169,10 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp, if (iter != astate->attrset.end()) { content_type = rgw_bl_str(iter->second); } + iter = astate->attrset.find(RGW_ATTR_STORAGE_CLASS); + if (iter != astate->attrset.end()) { + storage_class = rgw_bl_str(iter->second); + } iter = astate->attrset.find(RGW_ATTR_ACL); if (iter != astate->attrset.end()) { r = decode_policy(dpp, iter->second, &owner); @@ -9196,6 +9201,7 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp, object.meta.etag = etag; object.meta.content_type = content_type; + object.meta.storage_class = storage_class; object.meta.owner = owner.get_id().to_str(); object.meta.owner_display_name = owner.get_display_name(); @@ -9207,6 +9213,7 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp, list_state.meta.category = main_category; list_state.meta.etag = etag; list_state.meta.content_type = content_type; + list_state.meta.storage_class = storage_class; librados::IoCtx head_obj_ctx; // initialize to data pool so we can get pool id int ret = get_obj_head_ioctx(dpp, bucket_info, obj, &head_obj_ctx); -- 2.47.3