rgw: adjust error for bucket removal on secondary region

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 05c31d61689..f0c57e78cab 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);
   }