Merge remote-tracking branch 'origin/bugfix/CLDSRV-669-complete' into w/9.0/bugfix/CLDSRV-669-complete

Author: Seragonia

lib/api/completeMultipartUpload.js

@@ -536,35 +536,60 @@ function completeMultipartUpload(authInfo, request, log, callback) {
         function deletePartsMetadata(mpuBucket, keysToDelete, aggregateETag,
             extraPartLocations, destinationBucket, generatedVersionId, droppedMPUSize, next) {
             services.batchDeleteObjectMetadata(mpuBucket.getName(),
-                keysToDelete, log, err => next(err, extraPartLocations,
-                    destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize));
+                keysToDelete, log, err => {
+                    if (err) {
+                        // Handle specific error cases according to retry strategy
+                        if (err.is?.DeleteConflict) {
+                            // DeleteConflict should trigger automatic retry
+                            // Convert to InternalError to make it retryable
+                            return next(errors.InternalError, extraPartLocations,
+                                destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize);
+                        }
+
+                        // For NoSuchKey and other errors, return them as-is
+                        // NoSuchKey is non-retryable, InternalError and others are retryable
+                        return next(err, extraPartLocations,
+                            destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize);
+                    }
+                    return next(null, extraPartLocations,
+                        destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize);
+                });
         },
         function batchDeleteExtraParts(extraPartLocations, destinationBucket,
             aggregateETag, generatedVersionId, droppedMPUSize, next) {
             if (extraPartLocations && extraPartLocations.length > 0) {
                 return data.batchDelete(extraPartLocations, request.method, null, log, err => {
                     if (err) {
-                        return next(err);
+                        // Extra part deletion failure should not fail the operation
+                        // The S3 object was created successfully and MPU metadata was cleaned up
+                        // Orphaned extra parts are acceptable since the main operation succeeded
+                        log.warn('failed to delete extra parts, keeping orphan but returning success', {
+                            method: 'completeMultipartUpload',
+                            extraPartLocationsCount: extraPartLocations.length,
+                            error: err,
+                        });
                     }
-
-                    return validateQuotas(request, destinationBucket, request.accountQuotas,
-                        ['objectDelete'], 'objectDelete', -droppedMPUSize, false, log, err => {
-                            if (err) {
-                                // Ignore error, as the data has been deleted already: only inflight count
-                                // has not been updated, and will be eventually consistent anyway
-                                log.warn('failed to update inflights', {
-                                    method: 'completeMultipartUpload',
-                                    extraPartLocations,
-                                    error: err,
-                                });
-                            }
-                            return next(null, destinationBucket, aggregateETag,
-                                generatedVersionId);
-                    });
+                    return next(null, destinationBucket, aggregateETag,
+                        generatedVersionId, droppedMPUSize);
                 });
             }
             return next(null, destinationBucket, aggregateETag,
-                generatedVersionId);
+                generatedVersionId, droppedMPUSize);
+        },
+        function updateQuotas(destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize, next) {
+            return validateQuotas(request, destinationBucket, request.accountQuotas,
+                ['objectDelete'], 'objectDelete', -droppedMPUSize, false, log, err => {
+                    if (err) {
+                        // Ignore error, as the data has been deleted already: only inflight count
+                        // has not been updated, and will be eventually consistent anyway
+                        log.warn('failed to update inflights', {
+                            method: 'completeMultipartUpload',
+                            error: err,
+                        });
+                    }
+                    return next(null, destinationBucket, aggregateETag,
+                        generatedVersionId);
+            });
         },
     ], (err, destinationBucket, aggregateETag, generatedVersionId) => {
         const corsHeaders =