RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-27 14:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32562 from IlsooByun/fix_dm

Browse Source 
rgw: do not remove delete marker when fixing versioned bucket
This commit is contained in:
J. Eric Ivancich 2020-02-12 14:47:44 -05:00 committed by GitHub
commit 210fb41806
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rgw/rgw_rados.cc
View File

@ -8604,7 +8604,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) {