Merge remote-tracking branch 'origin/improvement/CLDSRV-741-test-abortmpu' into w/9.0/improvement/CLDSRV-741-test-abortmpu

Author: BourgoisMickael

lib/api/apiUtils/object/abortMultipartUpload.js

@@ -7,6 +7,8 @@ const metadataUtils = require('../../../metadata/metadataUtils');
 const { validateQuotas } = require('../quotas/quotaUtils');
 const services = require('../../../services');
 const metadata = require('../../../metadata/wrapper');
+const { preprocessingVersioningDelete } = require('./versioning');
+const { config } = require('../../../Config');
 
 function abortMultipartUpload(authInfo, bucketName, objectKey, uploadId, log,
     callback, request) {
@@ -129,7 +131,23 @@ function abortMultipartUpload(authInfo, bucketName, objectKey, uploadId, log,
                     // On error, continue the abort without an objectMD to clean up.
                     return next(null, mpuBucket, storedParts, destBucket, null, skipDataDelete);
                 }
-                return next(null, mpuBucket, storedParts, destBucket, foundVersion, skipDataDelete);
+                if (!foundVersion) {
+                    return next(null, mpuBucket, storedParts, destBucket, null, skipDataDelete);
+                }
+                // foundVersion is not in objectMD format, see MetadataWrapper _parseListEntries
+                // multiple fields are missing or differ in list entry versus objectMD
+                return metadataUtils.metadataGetObject(bucketName, objectKey, foundVersion.VersionId, null, log,
+                    (err, objectMD) => {
+                        if (err) {
+                            log.warn('error getting object version metadata, proceeding without cleanup', {
+                                error: err,
+                                method: 'abortMultipartUpload.findObjectToCleanup',
+                            });
+                            // On error, continue the abort without an objectMD to clean up.
+                            return next(null, mpuBucket, storedParts, destBucket, null, skipDataDelete);
+                        }
+                        return next(null, mpuBucket, storedParts, destBucket, objectMD, skipDataDelete);
+                });
             });
         },
         function deleteObjectMetadata(mpuBucket, storedParts, destBucket, objectMD,
@@ -145,9 +163,14 @@ function abortMultipartUpload(authInfo, bucketName, objectKey, uploadId, log,
                 uploadId,
                 versionId: objectMD.versionId,
             });
-            return metadata.deleteObjectMD(bucketName, objectKey, {
-                versionId: objectMD.versionId,
-            }, log, err => {
+
+            const options = preprocessingVersioningDelete(
+                bucketName, destBucket, objectMD, objectMD.versionId, config.nullVersionCompatMode);
+            options.replayId = uploadId;
+            // This is a ghost metadata, without data loss, so skip oplog
+            options.doesNotNeedOpogUpdate = true;
+
+            return metadata.deleteObjectMD(bucketName, objectKey, options, log, err => {
                 if (err) {
                     // Handle concurrent deletion of this object metadata
                     if (err.is?.NoSuchKey) {