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

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

diff --cc src/rgw/rgw_common.cc
index 49888007eab48f5191384770fa978b06ac1add30,0ea8140073ff180e928c778fa90153b2f7e3aee9..97e8973b162578190cf11997912c20f89fbd501f
--- 1/src/rgw/rgw_common.cc
--- 2/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({

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge