rgw/lc: delete expired delete-marker when processing Expiration lc action with Days...

Signed-off-by: Juan Zhu <jzhu4@dev-10-34-20-139.pw1.bcc.bloomberg.com>

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 4364c2e683c86ae683809b046f621e18927c6b8d..3dd8cb60e8f55a813061f6f9a0b3f6769143e2e2 100644 (file)
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1073,22 +1073,17 @@ public:
       return false;
     }
     if (o.is_delete_marker()) {
-      if (oc.next_key_name) {
-       std::string nkn = *oc.next_key_name;
-       if (oc.next_has_same_name(o.key.name)) {
-         ldpp_dout(dpp, 7) << __func__ << "(): dm-check SAME: key=" << o.key
-                          << " next_key_name: %%" << nkn << "%% "
-                          << oc.wq->thr_name() << dendl;
-         return false;
-       } else {
-         ldpp_dout(dpp, 7) << __func__ << "(): dm-check DELE: key=" << o.key
-                          << " next_key_name: %%" << nkn << "%% "
-                          << oc.wq->thr_name() << dendl;
-        *exp_time = real_clock::now();
-        return true;
-       }
+      if (oc.next_has_same_name(o.key.name)) {
+        ldpp_dout(dpp, 7) << __func__ << "(): dm-check SAME: key=" << o.key
+                          << " next_key_name: %%" << *oc.next_key_name << "%% "
+                          << oc.wq->thr_name() << dendl;
+        return false;
       }
-      return false;
+
+      ldpp_dout(dpp, 7) << __func__ << "(): dm-check DELE: key=" << o.key
+                        << " " << oc.wq->thr_name() << dendl;
+      *exp_time = real_clock::now();
+      return true;
     }
 
     auto& mtime = o.meta.mtime;