rgw: return proper message when deleting non-empty Swift's container.

The bug that is fixed in this patch has been responsible for failing
the Tempest's test_delete_non_empty_container test case.

The investigation has been made by: Marcus Watts <mwatts@redhat.com>.

Fixes: http://tracker.ceph.com/issues/21169
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc
index 09fcdbfe83f2ff1335a38a49cbdab8ce9100983c..13472446314ab16b9128d4377dd5090dab1e07fd 100644 (file)
--- a/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@ -124,6 +124,8 @@ rgw_http_errors rgw_http_swift_errors({
     { ERR_BAD_URL, {412, "Bad URL" }},
     { ERR_NOT_SLO_MANIFEST, {400, "Not an SLO manifest" }},
     { ERR_QUOTA_EXCEEDED, {413, "QuotaExceeded" }},
+    { ENOTEMPTY, {409, "There was a conflict when trying "
+                       "to complete your request." }},
     /* FIXME(rzarzynski): we need to find a way to apply Swift's error handling
      * procedures also for ERR_ZERO_IN_URL. This make a problem as the validation
      * is performed very early, even before setting the req_state::proto_flags. */