Skip to content

impr(S3UTILS-147/S3UTILS-151): #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 9 commits into
base: development/1.14
Choose a base branch
from
Open

impr(S3UTILS-147/S3UTILS-151): #304

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dc04bf6
impr(S3UTILS-150):
fra-scality Nov 21, 2023
8b576a2
chore linted
fra-scality Nov 21, 2023
bc925c3
redefined if for null
fra-scality Nov 23, 2023
3e57d5e
Strings must use singlequote
fra-scality Nov 23, 2023
468471f
There should be no space before this paren
fra-scality Nov 23, 2023
b3fc6ed
Refined check for NotComplete MD
fra-scality Nov 24, 2023
fd68158
linted
fra-scality Nov 24, 2023
4040b5c
linted
fra-scality Nov 24, 2023
f4b9fe4
linted again
fra-scality Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 46 additions & 14 deletions verifyBucketSproxydKeys.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ function logProgress(message) {
haveDupKeys: status.objectsWithDupKeys,
haveEmptyMetadata: status.objectsWithEmptyMetadata,
haveDupVersionIds: status.objectsWithDupVersionIds,
errors: status.objectErrors,
haveObjectsErrors: status.objectsErrors,
url: getObjectURL(status.bucketInProgress, status.KeyMarker),
});
}
Expand Down Expand Up @@ -384,7 +384,20 @@ function fetchAndCheckObject(bucket, itemKey, cb) {
return checkSproxydKeys(objectUrl, locations, () => cb(locations));
});
}

function hasMinimalMetadata(md) {
if (!md) {
return false;
}
return (
md.hasOwnProperty('md-model-version')
&& md.hasOwnProperty('owner-display-name')
&& md.hasOwnProperty('owner-id')
&& md.hasOwnProperty('content-length')
&& md.hasOwnProperty('content-type')
&& md.hasOwnProperty('last-modified')
&& md.hasOwnProperty('content-md5')
);
}
function listBucketIter(bucket, cb) {
const url = getBucketdURL(BUCKETD_HOSTPORT, {
Bucket: bucket,
Expand Down Expand Up @@ -415,8 +428,37 @@ function listBucketIter(bucket, cb) {
const vidSepPos = item.key.lastIndexOf('\0');
const objectUrl = getObjectURL(bucket, item.key);
let digestKey = item.key;

const md = JSON.parse(item.value);
let md;
try {
md = JSON.parse(item.value);
} catch (e) {
log.error('Invalid Metadata JSON', {
object: objectUrl,
error: e.message,
mdValue: item.value,
});
status.objectsScanned += 1;
status.objectsErrors += 1;
return itemDone();
}
if (item.value === '{}') {
log.error('object with empty metadata found', {
objectUrl,
});
status.objectsScanned += 1;
status.objectsWithEmptyMetadata += 1;
findDuplicateSproxydKeys.skipVersion();
return itemDone();
}
if (!hasMinimalMetadata(md)) {
log.error('Not Complete Metadata JSON', {
object: objectUrl,
mdValue: item.value,
});
status.objectsScanned += 1;
status.objectsErrors += 1;
return itemDone();
}
if (vidSepPos === -1) {
const reVersionIds = /"versionId":"([^"]*)"/g;
const versionIds = [];
Expand Down Expand Up @@ -458,16 +500,6 @@ function listBucketIter(bucket, cb) {
}
}

if (item.value === '{}') {
log.error('object with empty metadata found', {
objectUrl,
});
status.objectsScanned += 1;
status.objectsWithEmptyMetadata += 1;
findDuplicateSproxydKeys.skipVersion();
return itemDone();
}

if (md.isPHD) {
// object is a Place Holder Delete (PHD)
findDuplicateSproxydKeys.skipVersion();
Expand Down