]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: apply_olh_log should clear_olh before trimming olh log
authorCory Snyder <csnyder@1111systems.com>
Wed, 14 Jun 2023 14:01:43 +0000 (14:01 +0000)
committerCory Snyder <csnyder@1111systems.com>
Tue, 18 Jul 2023 17:53:53 +0000 (17:53 +0000)
commit18542f38ac98fdd21cce19d37693c0d371f3b7f7
tree4ba0258a09fd0830ae99d5bcb434f952c58dea6e
parente4dbd064c984e7ec9e4027acafde406846f43ce3
rgw: apply_olh_log should clear_olh before trimming olh log

When pending_removal is true and the log is trimmed prior to
clearing olh, it allows for the possibility that the olh is not
cleared (e.g. due to new pending xattrs on the olh obj), but the
olh log entries are removed.

Signed-off-by: Cory Snyder <csnyder@1111systems.com>
(cherry picked from commit dfbe4f9cb078bad9a0244ce433a9728f8bd6b912)

Conflicts:
src/rgw/driver/rados/rgw_rados.cc

Cherry-pick notes:
- conflicts due to https://github.com/ceph/ceph/pull/50206 on main
src/rgw/driver/rados/rgw_rados.cc