From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Mon, 3 Mar 2025 17:03:09 +0000 (-0500)
Subject: Merge pull request #61650 from cbodley/wip-rgw-delete-full-try
X-Git-Tag: v20.3.0~468
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=538be0dcf572d9aef42ae9f6563c75250fd0c53a;p=ceph.git

Merge pull request #61650 from cbodley/wip-rgw-delete-full-try

rgw/rados: enable object deletion at rados pool quota

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
---

538be0dcf572d9aef42ae9f6563c75250fd0c53a
diff --cc src/rgw/driver/rados/rgw_rados.cc
index 959e2f7d994,891fada8db0..3b420e3c7ab
--- a/src/rgw/driver/rados/rgw_rados.cc
+++ b/src/rgw/driver/rados/rgw_rados.cc
@@@ -6171,8 -6157,9 +6173,9 @@@ int RGWRados::Object::Delete::delete_ob
    }
  
    auto& ioctx = ref.ioctx;
+   ioctx.set_pool_full_try(); // allow deletion at pool quota limit
    version_t epoch = 0;
 -  r = rgw_rados_operate(dpp, ioctx, ref.obj.oid, &op, y, 0, nullptr, &epoch);
 +  r = rgw_rados_operate(dpp, ioctx, ref.obj.oid, std::move(op), y, 0, nullptr, &epoch);
  
    /* raced with another operation, object state is indeterminate */
    const bool need_invalidate = (r == -ECANCELED);