From 308c8d3ab7e3e4978beccba2c27beb95e75cde22 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Tue, 29 Aug 2017 12:16:30 +0200 Subject: [PATCH] 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 . Fixes: http://tracker.ceph.com/issues/21169 Signed-off-by: Radoslaw Zarzynski --- src/rgw/rgw_common.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index 09fcdbfe83f2..13472446314a 100644 --- 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. */ -- 2.47.3