From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 24 Sep 2025 17:20:09 +0000 (-0400)
Subject: rgw/lc: LCOpAction_CurrentExpiration checks mtime for delete markers
X-Git-Tag: testing/wip-jcollin-testing-20260212.143545-tentacle~68^2~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=511205af30e254d40eab26313d52a7fdb067c05d;p=ceph-ci.git

rgw/lc: LCOpAction_CurrentExpiration checks mtime for delete markers

the unconditional 'return true' for delete markers was causing check()
to ignore the lifecycle policy's "Days" field, causing delete markers to
be expired and removed prematurely

instead of the early return, fall through to the mtime/size comparisons
used for normal objects

Fixes: https://tracker.ceph.com/issues/73240

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 102eaa833d2b0c89a95a0e06876a16b3e2e6c6d8)
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index a18fbc0e5f0..77cb89da3aa 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1142,8 +1142,8 @@ public:
 
       ldpp_dout(dpp, 7) << __func__ << "(): dm-check DELE: key=" << o.key
                         << " " << oc.wq->thr_name() << dendl;
-      *exp_time = real_clock::now();
-      return true;
+
+      // go on to compare mtime, size, etc
     }
 
     auto& mtime = o.meta.mtime;