]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: do not remove delete marker when fixing versioned bucket 32562/head
authorIlsoo Byun <ilsoobyun@linecorp.com>
Thu, 9 Jan 2020 01:49:31 +0000 (10:49 +0900)
committerIlsoo Byun <ilsoobyun@linecorp.com>
Thu, 9 Jan 2020 01:49:31 +0000 (10:49 +0900)
Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
src/rgw/rgw_rados.cc

index b3e1d824f40de4a53df060ca67fefbb5b77555ad..e56c7dc2ce8db441c9b3f083de39b7582b004684 100644 (file)
@@ -8472,7 +8472,7 @@ int RGWRados::check_disk_state(librados::IoCtx io_ctx,
     return r;
 
   list_state.pending_map.clear(); // we don't need this and it inflates size
-  if (!astate->exists) {
+  if (!list_state.is_delete_marker() && !astate->exists) {
       /* object doesn't exist right now -- hopefully because it's
        * marked as !exists and got deleted */
     if (list_state.exists) {