From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Wed, 20 Mar 2024 13:40:43 +0000 (+0000)
Subject: Merge pull request #55795 from kchheda3/wip-rename-notif-events
X-Git-Tag: testing/wip-batrick-testing-20240411.154038~182
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b77f7656b73a5933a9cc5b3bfd1658c3bba9a93d;p=ceph-ci.git

Merge pull request #55795 from kchheda3/wip-rename-notif-events

rgw/notification: Make the LifeCycle & Replication events AWS Compatible and Support s3:Replication:Delete event

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
---

b77f7656b73a5933a9cc5b3bfd1658c3bba9a93d
diff --cc src/rgw/rgw_lc.cc
index 7169e09edbc,a75ce3a71c2..deb74465600
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@@ -1244,12 -1208,12 +1245,12 @@@ public
    int process(lc_op_ctx& oc) override {
      auto& o = oc.o;
      int r = remove_expired_obj(oc.dpp, oc, true,
- 			       rgw::notify::ObjectExpirationNoncurrent);
+                                {rgw::notify::ObjectExpirationNoncurrent});
      if (r < 0) {
        ldpp_dout(oc.dpp, 0) << "ERROR: remove_expired_obj (non-current expiration) " 
 -		       << oc.bucket << ":" << o.key
 -		       << " " << cpp_strerror(r)
 -		       << " " << oc.wq->thr_name() << dendl;
 +			   << oc.bucket << ":" << o.key
 +			   << " " << cpp_strerror(r)
 +			   << " " << oc.wq->thr_name() << dendl;
        return r;
      }
      if (perfcounter) {