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 <cbodley@redhat.com>
This commit is contained in:
Casey Bodley 2018-09-14 14:56:23 -04:00
parent 07a3e8d7a6
commit 764d6a8599

View File

@ -285,7 +285,7 @@ int abort_bucket_multiparts(RGWRados *store, CephContext *cct, RGWBucketInfo& bu
if (!mp.from_meta(key.name))
continue;
ret = abort_multipart_upload(store, cct, &obj_ctx, bucket_info, mp);
if (ret < 0) {
if (ret < 0 && ret != -ENOENT && ret != -ERR_NO_SUCH_UPLOAD) {
return ret;
}
num_deleted++;