From e6c36530bf4185d72ed220d6b406003f1cc28174 Mon Sep 17 00:00:00 2001
From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 16 Dec 2024 10:04:29 -0500
Subject: [PATCH] rgw: RGWAbortMultipart maps NoSuchKey to NoSuchUpload

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 36541efe49cdc7b3d4f58c7d6d6e254135491792)
---
 src/rgw/rgw_op.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index 5c36a20874f3a..b0e4db16fa52f 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6742,6 +6742,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);
-- 
2.39.5