]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rgw/lc: LCOpAction_CurrentExpiration checks mtime for delete markers
authorCasey Bodley <cbodley@redhat.com>
Wed, 24 Sep 2025 17:20:09 +0000 (13:20 -0400)
committerCasey Bodley <cbodley@redhat.com>
Wed, 15 Oct 2025 15:16:39 +0000 (11:16 -0400)
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)

src/rgw/rgw_lc.cc

index a18fbc0e5f0c6eaa9218e79b528b03f1918a3704..77cb89da3aab5bfa1616e02e1283faf87f5a6ba0 100644 (file)
@@ -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;