From 9aa930adf265048c8c7d5defbc87fd9c3d28d90c Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Fri, 14 Sep 2018 14:56:23 -0400 Subject: [PATCH] rgw: abort_bucket_multiparts() ignores individual NoSuchUpload errors if the bucket index lists multipart meta objects that don't actually exist in rados, this error prevents the bucket from being deleted Fixes: http://tracker.ceph.com/issues/35986 Signed-off-by: Casey Bodley (cherry picked from commit 764d6a8599eb5ea5a6382fea57e4b28f97e26d93) Conflicts: src/rgw/rgw_multi.cc : Resolved in abort_bucket_multiparts --- src/rgw/rgw_multi.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_multi.cc b/src/rgw/rgw_multi.cc index d455f9b8f8fb1..8e1d3ee80efc4 100644 --- a/src/rgw/rgw_multi.cc +++ b/src/rgw/rgw_multi.cc @@ -288,7 +288,7 @@ int abort_bucket_multiparts(RGWRados *store, CephContext *cct, RGWBucketInfo& bu continue; entry.obj = obj; ret = abort_multipart_upload(store, cct, &obj_ctx, bucket_info, entry.mp); - if (ret < 0) { + if (ret < 0 && ret != -ENOENT && ret != -ERR_NO_SUCH_UPLOAD) { return ret; } num_deleted++; -- 2.39.5