From: Ilsoo Byun <ilsoobyun@linecorp.com>
Date: Thu, 9 Jan 2020 01:49:31 +0000 (+0900)
Subject: rgw: do not remove delete marker when fixing versioned bucket
X-Git-Tag: v15.1.1~449^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bfbdb71f458a777001f00ec91a262cce59ba484f;p=ceph.git

rgw: do not remove delete marker when fixing versioned bucket

Signed-off-by: Ilsoo Byun <ilsoobyun@linecorp.com>
---

diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index b3e1d824f40d..e56c7dc2ce8d 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -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) {