]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #55795 from kchheda3/wip-rename-notif-events
authorCasey Bodley <cbodley@users.noreply.github.com>
Wed, 20 Mar 2024 13:40:43 +0000 (13:40 +0000)
committerGitHub <noreply@github.com>
Wed, 20 Mar 2024 13:40:43 +0000 (13:40 +0000)
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>
1  2 
src/rgw/rgw_lc.cc

index 7169e09edbc39d3d7f1128c3472b160f7c5ab56f,a75ce3a71c2958b04707167522d475587c9b2d30..deb74465600b2588621a5ec750915f1c048d2d88
@@@ -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) {