RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23646 from ashitakasam/get_cors_err_code

Browse Source 
rgw: the error code returned by rgw is different from amz s3 when getting cors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2018-09-04 17:53:01 -04:00 committed by GitHub
commit 73d8aceffa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rgw/rgw_common.cc
View File

@ -95,6 +95,7 @@ rgw_http_errors rgw_http_s3_errors({
{ ERR_NO_SUCH_BUCKET_POLICY, {404, "NoSuchBucketPolicy"}},
{ ERR_NO_SUCH_USER, {404, "NoSuchUser"}},
{ ERR_NO_ROLE_FOUND, {404, "NoSuchEntity"}},
{ ERR_NO_CORS_FOUND, {404, "NoSuchCORSConfiguration"}},
{ ERR_NO_SUCH_SUBUSER, {404, "NoSuchSubUser"}},
{ ERR_METHOD_NOT_ALLOWED, {405, "MethodNotAllowed" }},
{ ETIMEDOUT, {408, "RequestTimeout" }},

1
src/rgw/rgw_common.h
View File

@ -218,6 +218,7 @@ using ceph::crypto::MD5;
#define ERR_ZONEGROUP_DEFAULT_PLACEMENT_MISCONFIGURATION 2213
#define ERR_INVALID_ENCRYPTION_ALGORITHM 2214
#define ERR_INVALID_CORS_RULES_ERROR 2215
#define ERR_NO_CORS_FOUND 2216
#define ERR_BUSY_RESHARDING 2300

2
src/rgw/rgw_op.cc
View File

@ -5205,7 +5205,7 @@ void RGWGetCORS::execute()
if (!cors_exist) {
ldpp_dout(this, 2) << "No CORS configuration set yet for this bucket" << dendl;
op_ret = -ENOENT;
op_ret = -ERR_NO_CORS_FOUND;
return;
}
}