From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Sat, 11 Mar 2023 19:32:47 +0000 (-0500)
Subject: Merge pull request #49466 from linuxbox2/wip-lc-size
X-Git-Tag: v19.0.0~1572
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba9949744aba75aa5e0e2849ac6b7db41c5b2b92;p=ceph.git

Merge pull request #49466 from linuxbox2/wip-lc-size

rgw/notifications: fetch object state to get size, in rgw_lc.cc

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
---

ba9949744aba75aa5e0e2849ac6b7db41c5b2b92
diff --cc src/rgw/rgw_lc.cc
index 212ed444e75b,9f2468fca8e4..618ff9024a7e
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@@ -538,7 -540,25 +538,14 @@@ static int remove_expired_obj
      return ret;
    }
  
 -  // XXXX currently, rgw::sal::Bucket.owner is always null here
 -  std::unique_ptr<rgw::sal::User> user;
 -  if (! bucket->get_owner()) {
 -    auto& bucket_info = bucket->get_info();
 -    user = driver->get_user(bucket_info.owner);
 -    // forgive me, lord
 -    if (user) {
 -      bucket->set_owner(user.get());
 -    }
 -  }
 -
    obj = bucket->get_object(obj_key);
+ 
+   RGWObjState* obj_state{nullptr};
+   ret = obj->get_obj_state(dpp, &obj_state, null_yield, true);
+   if (ret < 0) {
+     return ret;
+   }
+ 
    std::unique_ptr<rgw::sal::Object::DeleteOp> del_op
      = obj->get_delete_op();
    del_op->params.versioning_status