From cc2033ee15dace68f5f6f7ac6c2e2a767f7597bb Mon Sep 17 00:00:00 2001 From: "cao.leilc" Date: Thu, 10 Jun 2021 10:34:54 +0800 Subject: [PATCH] rgw : modfiy error XML for deleterole Fixes: https://tracker.ceph.com/issues/51157 Signed-off-by: caolei (cherry picked from commit c7ab6579c7655352d08a4c12fc3a6951217dbe6f) --- src/rgw/rgw_rest_role.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/rgw/rgw_rest_role.cc b/src/rgw/rgw_rest_role.cc index 1e9cdf71b217..605746480ca1 100644 --- a/src/rgw/rgw_rest_role.cc +++ b/src/rgw/rgw_rest_role.cc @@ -176,12 +176,13 @@ void RGWDeleteRole::execute(optional_yield y) if (op_ret == -ENOENT) { op_ret = -ERR_NO_ROLE_FOUND; } - - s->formatter->open_object_section("DeleteRoleResponse"); - s->formatter->open_object_section("ResponseMetadata"); - s->formatter->dump_string("RequestId", s->trans_id); - s->formatter->close_section(); - s->formatter->close_section(); + if (!op_ret) { + s->formatter->open_object_section("DeleteRoleResponse"); + s->formatter->open_object_section("ResponseMetadata"); + s->formatter->dump_string("RequestId", s->trans_id); + s->formatter->close_section(); + s->formatter->close_section(); + } } int RGWGetRole::verify_permission(optional_yield y) -- 2.47.3