From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 18 Jul 2013 17:48:39 +0000 (-0700)
Subject: rgw: adjust error for bucket removal on secondary region
X-Git-Tag: v0.67-rc1~16^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=989a4d93d88d5342c8369c7f9c22af66601bfdbf;p=ceph.git

rgw: adjust error for bucket removal on secondary region

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

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