From: Jiffin Tony Thottan <thottanjiffin@gmail.com>
Date: Fri, 21 Mar 2025 06:36:34 +0000 (+0530)
Subject: Merge pull request #61745 from soumyakoduri/wip-skoduri-glacier-cli
X-Git-Tag: v20.3.0~299
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6332769ab1735e8e5c19809ba670399df2403571;p=ceph.git

Merge pull request #61745 from soumyakoduri/wip-skoduri-glacier-cli

rgw/cloud-restore [PART1] : Add Restore support from Glacier/Tape cloud endpoints
---

6332769ab1735e8e5c19809ba670399df2403571
diff --cc src/rgw/rgw_common.cc
index 49888007eab48,0ea8140073ff1..97e8973b16257
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@@ -139,9 -139,8 +139,10 @@@ rgw_http_errors rgw_http_s3_errors(
      { ERR_NO_SUCH_BUCKET_ENCRYPTION_CONFIGURATION, {404, "ServerSideEncryptionConfigurationNotFoundError"}},
      { ERR_NO_SUCH_PUBLIC_ACCESS_BLOCK_CONFIGURATION, {404, "NoSuchPublicAccessBlockConfiguration"}},
      { ERR_ACCOUNT_EXISTS, {409, "AccountAlreadyExists"}},
+     { ERR_RESTORE_ALREADY_IN_PROGRESS, {409, "RestoreAlreadyInProgress"}},
      { ECANCELED, {409, "ConcurrentModification"}},
 +    { EDQUOT, {507, "InsufficientCapacity"}},
 +    { ENOSPC, {507, "InsufficientCapacity"}},
  });
  
  rgw_http_errors rgw_http_swift_errors({