Skip to content

fix: normalise archive timestamps before comparing them #408

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

Merged
bert-e merged 2 commits into from
Sep 24, 2026
+123 −31
Merged

fix: normalise archive timestamps before comparing them #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e49d7c6
Normalise archive timestamps before comparing them
delthas Sep 17, 2026
7ec47b0
Bump package.json to 1.17.15
delthas Sep 24, 2026
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "s3utils",
"version": "1.17.14",
"version": "1.17.15",
"engines": {
"node": ">= 22"
},
Expand Down
139 changes: 114 additions & 25 deletions tests/unit/utils/S3UtilsMongoClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,39 @@ describe('S3UtilsMongoClient::_processEntryData', () => {
},
},
],
[
'should add content-length to cold storage location and current dataStore '
+ 'when object is restoring with string typed timestamps',
testBucketName,
true,
{
_id: 'testkey6b',
value: {
...objectMdTemp,
dataStoreName: 'cold-location',
replicationInfo: {
backends: [],
},
archive: {
archiveInfo: {},
restoreRequestedAt: new Date(Date.now() - 1000).toISOString(),
restoreCompletedAt: null,
restoreWillExpireAt: null,
},
},
},
locationConfig,
{
data: {
account: { [testAccountCanonicalId]: 42 },
bucket: { [`${testBucketName}_${testBucketCreationDate}`]: 42 },
location: {
'us-east-1': 42,
'cold-location': 42,
},
},
},
],
[
'should add content-length to cold storage location and current dataStore '
+ 'when object is restored',
Expand Down Expand Up @@ -923,6 +956,38 @@ describe('S3UtilsMongoClient::_processEntryData', () => {
},
},
],
[
'should add content-length to cold storage location and current dataStore '
Comment thread
delthas marked this conversation as resolved.
+ 'when object is restored with string typed timestamps',
testBucketName,
true,
{
_id: 'testkey6c',
value: {
...objectMdTemp,
'replicationInfo': {
backends: [],
},
'archive': {
archiveInfo: {},
restoreCompletedAt: new Date(Date.now() - 1000).toISOString(),
restoreWillExpireAt: new Date(Date.now() + 1000).toISOString(),
},
'x-amz-storage-class': 'cold-location',
},
},
locationConfig,
{
data: {
account: { [testAccountCanonicalId]: 42 },
bucket: { [`${testBucketName}_${testBucketCreationDate}`]: 42 },
location: {
'us-east-1': 42,
'cold-location': 42,
},
},
},
],
[
'should return error if content-length is invalid',
testBucketName,
Expand Down Expand Up @@ -3174,31 +3239,55 @@ describe('S3UtilsMongoClient, cold object helpers', () => {
assert.strictEqual(mongoTestClient._isObjectCold(coldObject), true);
});

it('should detect a restoring object', () => {
const restoringObject = {
value: {
...coldObjectMdTemp,
archive: new ObjectMDArchive({}, new Date(Date.now() - 5000), 10),
dataStoreName: 'cold-location',
},
};
assert.strictEqual(mongoTestClient._isObjectRestoring(restoringObject), true);
});
// Arsenal types the archive timestamps `Date | string` and stores them as
// given, so both forms reach these helpers.
describe.each([
['Date', date => date],
['string', date => date.toISOString()],
])('with %s timestamps', (label, stored) => {
it('should detect a restoring object', () => {
const restoringObject = {
value: {
...coldObjectMdTemp,
archive: new ObjectMDArchive({}, stored(new Date(Date.now() - 5000)), 10),
dataStoreName: 'cold-location',
},
};
assert.strictEqual(mongoTestClient._isObjectRestoring(restoringObject), true);
});

it('should detect a restored object', () => {
const restoredObject = {
value: {
...coldObjectMdTemp,
archive: new ObjectMDArchive(
{},
new Date(Date.now() - 5000),
10,
new Date(Date.now() - 1000),
new Date(Date.now() + 10000),
),
dataStoreName: 'us-east-1',
},
};
assert.strictEqual(mongoTestClient._isObjectRestored(restoredObject), true);
it('should detect a restored object', () => {
const restoredObject = {
value: {
...coldObjectMdTemp,
archive: new ObjectMDArchive(
{},
stored(new Date(Date.now() - 5000)),
10,
stored(new Date(Date.now() - 1000)),
stored(new Date(Date.now() + 10000)),
),
dataStoreName: 'us-east-1',
},
};
assert.strictEqual(mongoTestClient._isObjectRestored(restoredObject), true);
});

it('should detect an object with an expired restore as cold', () => {
const expiredObject = {
value: {
...coldObjectMdTemp,
archive: new ObjectMDArchive(
{},
stored(new Date(Date.now() - 90000)),
10,
stored(new Date(Date.now() - 80000)),
stored(new Date(Date.now() - 1000)),
),
dataStoreName: 'cold-location',
},
};
assert.strictEqual(mongoTestClient._isObjectCold(expiredObject), true);
});
});
});
13 changes: 8 additions & 5 deletions utils/S3UtilsMongoClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,8 @@ class S3UtilsMongoClient extends MongoClientInterface {
*/
_isObjectCold(entry) {
return entry.value.archive
&& (!entry.value.archive.restoreRequestedAt || entry.value.archive.restoreWillExpireAt <= Date.now());
&& (!entry.value.archive.restoreRequestedAt
|| new Date(entry.value.archive.restoreWillExpireAt) <= Date.now());
}

/**
Expand All @@ -1104,8 +1105,9 @@ class S3UtilsMongoClient extends MongoClientInterface {
*/
_isObjectRestoring(entry) {
return entry.value.archive
&& entry.value.archive.restoreRequestedAt <= Date.now()
&& (!entry.value.archive.restoreCompletedAt || entry.value.archive.restoreCompletedAt > Date.now());
&& new Date(entry.value.archive.restoreRequestedAt) <= Date.now()
&& (!entry.value.archive.restoreCompletedAt
|| new Date(entry.value.archive.restoreCompletedAt) > Date.now());
}

/**
Expand All @@ -1115,8 +1117,9 @@ class S3UtilsMongoClient extends MongoClientInterface {
*/
_isObjectRestored(entry) {
return entry.value.archive
&& entry.value.archive.restoreCompletedAt && (entry.value.archive.restoreCompletedAt <= Date.now())
&& entry.value.archive.restoreWillExpireAt > Date.now();
&& entry.value.archive.restoreCompletedAt
&& (new Date(entry.value.archive.restoreCompletedAt) <= Date.now())
&& new Date(entry.value.archive.restoreWillExpireAt) > Date.now();
}
}

Expand Down
Loading