From 989a4d93d88d5342c8369c7f9c22af66601bfdbf Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Thu, 18 Jul 2013 10:48:39 -0700 Subject: [PATCH] rgw: adjust error for bucket removal on secondary region Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_op.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 05c31d61689dc..f0c57e78cabe7 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -1074,8 +1074,13 @@ void RGWDeleteBucket::execute() bufferlist in_data; JSONParser jp; ret = forward_request_to_master(s, store, in_data, &jp); - if (ret < 0) + if (ret < 0) { + if (ret == -ENOENT) { /* adjust error, + we want to return with NoSuchBucket and not NoSuchKey */ + ret = -ERR_NO_SUCH_BUCKET; + } return; + } JSONDecoder::decode_json("object_ver", objv_tracker.read_version, &jp); } -- 2.39.5