Skip to content

Commit 8b4f5bd

Browse files
committed
🔇 remove logs used to debug
Issue: CLDSRV-765
1 parent f89c54a commit 8b4f5bd

File tree

3 files changed

+3
-52
lines changed

3 files changed

+3
-52
lines changed

lib/api/completeMultipartUpload.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -535,21 +535,10 @@ function completeMultipartUpload(authInfo, request, log, callback) {
535535
},
536536
function deletePartsMetadata(mpuBucket, keysToDelete, aggregateETag,
537537
extraPartLocations, destinationBucket, generatedVersionId, droppedMPUSize, next) {
538-
log.warn('Deleting MPU parts metadata', { method: 'completeMultipartUpload' });
539538
services.batchDeleteObjectMetadata(mpuBucket.getName(),
540539
keysToDelete, log, err => {
541540
if (err) {
542-
log.warn(
543-
'error deleting MPU parts metadata',
544-
{ error: err, method: 'deletePartsMetadata' },
545-
);
546-
console.info({ errorCustom: JSON.stringify(err) });
547-
// Handle specific error cases according to retry strategy
548541
if (err.is?.DeleteConflict) {
549-
log.warn(
550-
'conflict deleting MPU parts metadata, will retry',
551-
{ method: 'deletePartsMetadata' },
552-
);
553542
// DeleteConflict should trigger automatic retry
554543
// Convert to InternalError to make it retryable
555544
const customErr = errorInstances.InternalError.customizeDescription(
@@ -562,22 +551,16 @@ function completeMultipartUpload(authInfo, request, log, callback) {
562551

563552
// For NoSuchKey and other errors, return them as-is
564553
// NoSuchKey is non-retryable, InternalError and others are retryable
565-
log.warn(
566-
'error deleting MPU parts metadata, returning error',
567-
{ method: 'deletePartsMetadata' },
568-
);
569554
return next(err, extraPartLocations,
570555
destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize);
571556
}
572557

573-
log.warn('Successfully deleted MPU parts metadata', { method: 'deletePartsMetadta' });
574558
return next(null, extraPartLocations,
575559
destinationBucket, aggregateETag, generatedVersionId, droppedMPUSize);
576560
});
577561
},
578562
function batchDeleteExtraParts(extraPartLocations, destinationBucket,
579563
aggregateETag, generatedVersionId, droppedMPUSize, next) {
580-
log.warn('deleting extra parts if any', { method: 'batchDeleteExtraParts' });
581564
if (extraPartLocations && extraPartLocations.length > 0) {
582565
return data.batchDelete(extraPartLocations, request.method, null, log, err => {
583566
if (err) {

lib/services.js

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -984,28 +984,8 @@ const services = {
984984
// all at once in production implementation
985985
assert.strictEqual(typeof mpuBucketName, 'string');
986986
async.eachLimit(keysToDelete, 5, (key, callback) => {
987-
metadata.deleteObjectMD(mpuBucketName, key, { overheadField: constants.overheadField }, log, err => {
988-
if (err) {
989-
console.info({ errorInBatch: err });
990-
log.error('error deleting part metadata in batch', {
991-
error: err,
992-
method: 'services.batchDeleteObjectMetadata',
993-
key,
994-
});
995-
}
996-
return callback(err);
997-
});
998-
}, err => {
999-
if (err) {
1000-
console.info({ finalErrorInBatch: err });
1001-
log.error('error in batch (final) deleting part metadata', {
1002-
error: err,
1003-
method: 'services.batchDeleteObjectMetadata',
1004-
});
1005-
}
1006-
1007-
return cb(err);
1008-
});
987+
metadata.deleteObjectMD(mpuBucketName, key, { overheadField: constants.overheadField }, log, callback);
988+
}, cb);
1009989
},
1010990
};
1011991

tests/functional/aws-node-sdk/test/object/copyPart.js

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -580,7 +580,7 @@ describe('Object Part Copy', () => {
580580
});
581581
});
582582

583-
it.only('should not corrupt object if overwriting an existing part by copying a part ' +
583+
it('should not corrupt object if overwriting an existing part by copying a part ' +
584584
'while the MPU is being completed', async () => {
585585
const finalObjETag = '"db77ebbae9e9f5a244a26b86193ad818-1"';
586586
process.stdout.write('Putting first part in MPU test"');
@@ -621,21 +621,9 @@ describe('Object Part Copy', () => {
621621
},
622622
}).promise()
623623
.catch(async err => {
624-
// The completeMPU delete part in a 2 steps
625-
// (first mark it as deletion with `delete: true` in Mongo, then delete it).
626-
// At the same time, the uploadPartCopy update the same data in Mongo.
627-
// In that case, the completeMPU fail with an InternalError (DeleteConflict in the logs)
628624
const raceConditionOccurred = err?.code === 'InternalError'
629625
&& err?.message === 'conflict deleting MPU parts metadata';
630626

631-
console.info({
632-
raceConditionOccurred,
633-
err,
634-
message: err?.message,
635-
description: err.description,
636-
code: err?.code,
637-
});
638-
639627
if (raceConditionOccurred) {
640628
return Promise.resolve(null);
641629
}

0 commit comments

Comments
 (0)