]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: check object storage_class when check_disk_state 46238/head
authorHuber-ming <zhangsm01@inspur.com>
Thu, 12 May 2022 07:09:15 +0000 (15:09 +0800)
committerHuber-ming <zhangsm01@inspur.com>
Thu, 12 May 2022 07:35:17 +0000 (15:35 +0800)
fix: https://tracker.ceph.com/issues/55618

Signed-off-by: Huber-ming <zhangsm01@inspur.com>
src/rgw/rgw_rados.cc

index 3dcb072cbef5bd9ff4bb88a50c0db92b2b26a557..14f93e503468227055329151bdbe0b67a836f2cc 100644 (file)
@@ -9229,6 +9229,7 @@ int RGWRados::check_disk_state(const DoutPrefixProvider *dpp,
 
   string etag;
   string content_type;
+  string storage_class;
   ACLOwner owner;
 
   object.meta.size = astate->size;
@@ -9243,6 +9244,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);
@@ -9271,6 +9276,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();
 
@@ -9282,6 +9288,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->get_obj(), &head_obj_ctx);