]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #61650 from cbodley/wip-rgw-delete-full-try
authorCasey Bodley <cbodley@users.noreply.github.com>
Mon, 3 Mar 2025 17:03:09 +0000 (12:03 -0500)
committerGitHub <noreply@github.com>
Mon, 3 Mar 2025 17:03:09 +0000 (12:03 -0500)
rgw/rados: enable object deletion at rados pool quota

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
1  2 
src/rgw/driver/rados/rgw_gc.cc
src/rgw/driver/rados/rgw_rados.cc

Simple merge
index 959e2f7d9943a9f67d72fe69e0e33be5cefa7bad,891fada8db023e6a1ce1071eaeefd291b5075617..3b420e3c7ab617a7b07fb7f391e3456083477d4a
@@@ -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);