From: Trang Tran <tttrangptit@gmail.com>
Date: Thu, 24 Oct 2024 10:49:20 +0000 (+0700)
Subject: rgw/lc: Fix lifecycle not working while bucket versioning is suspended
X-Git-Tag: v19.2.1~9^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5e43fa1baf415a9fbe91a89ae647d51851914801;p=ceph.git

rgw/lc: Fix lifecycle not working while bucket versioning is suspended

Signed-off-by: Trang Tran <tttrangptit@gmail.com>
(cherry picked from commit e1f3344216011a61b65013aec26220f180f4cfaf)
---

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index a91b830139723..43c77ba23eefb 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1183,7 +1183,7 @@ public:
 		       << " " << oc.wq->thr_name() << dendl;
     } else {
       /* ! o.is_delete_marker() */
-      r = remove_expired_obj(oc.dpp, oc, !oc.bucket->versioned(),
+      r = remove_expired_obj(oc.dpp, oc, !oc.bucket->versioning_enabled(),
                              {rgw::notify::ObjectExpirationCurrent,
                               rgw::notify::LifecycleExpirationDelete});
       if (r < 0) {