]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: completion of multipart upload leaves delete marker 41769/head
authorJ. Eric Ivancich <ivancich@redhat.com>
Tue, 1 Jun 2021 19:17:23 +0000 (15:17 -0400)
committerJ. Eric Ivancich <ivancich@redhat.com>
Tue, 8 Jun 2021 18:24:44 +0000 (14:24 -0400)
commit926f859032e3ee7f4c6ade3a4687177944d5806c
treeb4c7b24e3a5ddc7ff56d1f27df85252614635a42
parentcdee62ae28fb8833e4b384c64f3a6e4f17807ab7
rgw: completion of multipart upload leaves delete marker

The multipart upload meta object is deleted when the multipart upload
is completed. When the bucket is versioned, it needs to be deleted
from the bucket index rather than go through versioning delete process
that adds a delete marker to the bucket index rather than simply
removing it from the bucket index.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit 9ab7c18c4039f7b7283da3182807641d99b01ca7)

Conflicts:
  src/rgw/rgw_op.cc        : adapted to significant Zipper mods
  src/rgw/rgw_rados.cc     : adapted to significant Zipper mods
  src/rgw/rgw_rados.h      : adapted to significant Zipper mods
  src/rgw/rgw_sal.h        : adapted to significant Zipper mods
  src/rgw/rgw_sal_rados.cc : adapted to significant Zipper mods
  src/rgw/rgw_sal_rados.h  : adapted to significant Zipper mods
src/rgw/rgw_op.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_sal.h
src/rgw/rgw_sal_rados.cc
src/rgw/rgw_sal_rados.h