From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 16 Dec 2024 15:04:29 +0000 (-0500)
Subject: rgw: RGWAbortMultipart maps NoSuchKey to NoSuchUpload
X-Git-Tag: testing/wip-khiremat-testing-20250422.120708-squid-debug~75^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ca9fd124bbcd1aa6207c26dba9337bb2c86c0534;p=ceph-ci.git

rgw: RGWAbortMultipart maps NoSuchKey to NoSuchUpload

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 36541efe49cdc7b3d4f58c7d6d6e254135491792)
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 1d155f3557a..54c10fe083e 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6563,6 +6563,9 @@ void RGWAbortMultipart::execute(optional_yield y)
   auto serializer = meta_obj->get_serializer(this, "RGWCompleteMultipart");
   op_ret = serializer->try_lock(this, dur, y);
   if (op_ret < 0) {
+    if (op_ret == -ENOENT) {
+      op_ret = -ERR_NO_SUCH_UPLOAD;
+    }
     return;
   }
   op_ret = upload->abort(this, s->cct, y);