]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw : modfiy error XML for deleterole 42639/head
authorcao.leilc <cao.leilc@inspur.com>
Thu, 10 Jun 2021 02:34:54 +0000 (10:34 +0800)
committerCory Snyder <csnyder@iland.com>
Wed, 4 Aug 2021 14:25:15 +0000 (10:25 -0400)
Fixes: https://tracker.ceph.com/issues/51157
Signed-off-by: caolei <halei15848934852@163.com>
(cherry picked from commit c7ab6579c7655352d08a4c12fc3a6951217dbe6f)

src/rgw/rgw_rest_role.cc

index 1e9cdf71b217d9dacd854035233358fe2c69b366..605746480ca1ddd0ac1854a25b77bafaba2c2f94 100644 (file)
@@ -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)