Merge pull request ceph#62110 from cbodley/wip-69842

rgw: rgw_init_ioctx() adds set_pool_full_try()

Reviewed-by: Adam Emerson <[email protected]>

Author: cbodley

qa/suites/rgw/verify/tasks/rados-pool-quota.yaml

@@ -9,3 +9,4 @@ overrides:
     log-ignorelist:
       - reached quota
       - POOL_FULL
+      - pool(s) full

qa/workunits/rgw/test_rgw_rados_pool_quota.py

@@ -71,6 +71,16 @@ def main():
     exec_cmd(f'rados -p {DATA_POOL} ls')
     log.debug('forced quota to propagate')
 
+    # expect uploads to fail at pool quota
+    try:
+        bucket.put_object(Key=f'{key}-at-quota', Body=b"new data")
+    except botocore.exceptions.ClientError as e:
+        if not e.response['Error']['Code'] == 'InsufficientCapacity':
+            raise
+    else:
+        assert False, 'Upload succeeded at quota limit, expected InsufficientCapacity'
+
+    # expect deletions to succeed at pool quota
     for obj in objects:
         try:
             bucket.Object(obj).delete()

src/rgw/driver/rados/rgw_cr_rados.cc

@@ -437,7 +437,7 @@ RGWRadosRemoveCR::RGWRadosRemoveCR(rgw::sal::RadosStore* store, const rgw_raw_ob
 int RGWRadosRemoveCR::send_request(const DoutPrefixProvider *dpp)
 {
   auto rados = store->getRados()->get_rados_handle();
-  int r = rados->ioctx_create(obj.pool.name.c_str(), ioctx);
+  int r = rgw_init_ioctx(dpp, rados, obj.pool, ioctx);
   if (r < 0) {
     lderr(cct) << "ERROR: failed to open pool (" << obj.pool.name << ") ret=" << r << dendl;
     return r;

src/rgw/driver/rados/rgw_tools.cc

@@ -94,6 +94,8 @@ int rgw_init_ioctx(const DoutPrefixProvider *dpp,
   if (!pool.ns.empty()) {
     ioctx.set_namespace(pool.ns);
   }
+  // at pool quota, never block waiting for space - we want to error immediately
+  ioctx.set_pool_full_try();
   return 0;
 }
 

src/rgw/rgw_common.cc

@@ -140,6 +140,8 @@ rgw_http_errors rgw_http_s3_errors({
     { ERR_NO_SUCH_PUBLIC_ACCESS_BLOCK_CONFIGURATION, {404, "NoSuchPublicAccessBlockConfiguration"}},
     { ERR_ACCOUNT_EXISTS, {409, "AccountAlreadyExists"}},
     { ECANCELED, {409, "ConcurrentModification"}},
+    { EDQUOT, {507, "InsufficientCapacity"}},
+    { ENOSPC, {507, "InsufficientCapacity"}},
 });
 
 rgw_http_errors rgw_http_swift_errors({

src/rgw/rgw_rest.cc

@@ -83,6 +83,7 @@ const static struct rgw_http_status_code http_codes[] = {
   { 500, "Internal Server Error" },
   { 501, "Not Implemented" },
   { 503, "Slow Down"},
+  { 507, "Insufficient Storage"},
   { 0, NULL },
 };