From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Fri, 19 Aug 2022 13:24:35 +0000 (-0400)
Subject: Merge pull request #46547 from Huber-ming/check_appendable
X-Git-Tag: v18.0.0~224
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16c0ba743b716f6043ebc660b0791228b53a48e4;p=ceph.git

Merge pull request #46547 from Huber-ming/check_appendable

rgw: check object appendable when check_disk_state

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

16c0ba743b716f6043ebc660b0791228b53a48e4
diff --cc src/rgw/rgw_rados.cc
index ad2376669eec,55bd2406d673..b93bf1a049e9
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@@ -9255,8 -9262,8 +9255,9 @@@ int RGWRados::check_disk_state(const Do
  
    string etag;
    string content_type;
 +  string storage_class;
    ACLOwner owner;
+   bool appendable = false;
  
    object.meta.size = astate->size;
    object.meta.accounted_size = astate->accounted_size;
@@@ -9302,9 -9309,9 +9307,10 @@@
  
    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();
+   object.meta.appendable = appendable;
  
    // encode suggested updates
  
@@@ -9313,8 -9320,8 +9319,9 @@@
    list_state.meta.mtime = object.meta.mtime;
    list_state.meta.category = main_category;
    list_state.meta.etag = etag;
+   list_state.meta.appendable = appendable;
    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);