Skip to content

ARSN-515 ✨ Add a new condition "$exists: false" in repairMaster option to manage #2490

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
merged 2 commits into from
Sep 1, 2025
Merged

ARSN-515 ✨ Add a new condition "$exists: false" in repairMaster option to manage #2490

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
6387296
✨ add a new condition "$exists: false" in repairMaster option to manage
DarkIsDude Aug 26, 2025
6f7373b
♻️ simplify the code with single line of code
DarkIsDude Sep 1, 2025
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
23 changes: 9 additions & 14 deletions lib/storage/metadata/mongoclient/MongoClientInterface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -856,16 +856,9 @@ class MongoClientInterface {
// filter to get master
const filter = {
_id: masterKey,
$or: [{
'value.versionId': {
$exists: false,
},
},
{
'value.versionId': {
$gt: objVal.versionId,
},
},
$or: [
{ 'value.versionId': { $exists: false } },
{ 'value.versionId': { $gt: objVal.versionId } },
],
};
// values to update master
Expand Down Expand Up @@ -1143,8 +1136,9 @@ class MongoClientInterface {
const ops: AnyBulkWriteOperation<ObjectMetastoreDocument>[] = [];
// filter to get master
const filter = {
'_id': masterKey,
'value.versionId': {
_id: masterKey,
$or: [
{ 'value.versionId': { $exists: false } },
// We break the semantic correctness here with
// $gte instead of $gt because we do not have
// a microVersionId to capture the micro
Expand All @@ -1155,8 +1149,9 @@ class MongoClientInterface {
// replication and ingestion can hopefully
// ensure), but this would not work e.g. in
// the case of an active-active replication.
$gte: mstObjVal!.versionId,
},

{ 'value.versionId': { $gte: mstObjVal!.versionId } },
]
};
// values to update master
const update = {
Expand Down
85 changes: 80 additions & 5 deletions tests/unit/storage/metadata/mongoclient/MongoClientInterface.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const MongoUtils = require('../../../../../lib/storage/metadata/mongoclient/util
const ObjectMD = require('../../../../../lib/models/ObjectMD').default;
const { BucketVersioningKeyFormat } = require('../../../../../lib/versioning/constants').VersioningConstants;
const { formatMasterKey } = require('../../../../../lib/storage/metadata/mongoclient/utils');
const { promisify } = require('util');

const dbName = 'metadata';
const baseBucket = BucketInfo.fromObj({
Expand Down Expand Up @@ -716,15 +717,27 @@ describe('MongoClientInterface, tests', () => {
assert.ok(retrievedCapacityInfo, 'VeeamSOSApi.CapacityInfo should exist');

assert.strictEqual(typeof retrievedCapacityInfo.Capacity, 'bigint', 'Capacity should be a bigint');
assert.strictEqual(retrievedCapacityInfo.Capacity.toString(), veeamCapacity.Capacity, 'Capacity value mismatch');
assert.strictEqual(
retrievedCapacityInfo.Capacity.toString(),
veeamCapacity.Capacity,
'Capacity value mismatch',
);

assert.strictEqual(typeof retrievedCapacityInfo.Available, 'bigint', 'Available should be a bigint');
assert.strictEqual(retrievedCapacityInfo.Available.toString(), veeamCapacity.Available, 'Available value mismatch');
assert.strictEqual(
retrievedCapacityInfo.Available.toString(),
veeamCapacity.Available,
'Available value mismatch',
);

assert.strictEqual(typeof retrievedCapacityInfo.Used, 'bigint', 'Used should be a bigint');
assert.strictEqual(retrievedCapacityInfo.Used.toString(), veeamCapacity.Used, 'Used value mismatch');

assert.strictEqual(retrievedCapacityInfo.LastModified, veeamCapacity.LastModified, 'LastModified value mismatch');
assert.strictEqual(
retrievedCapacityInfo.LastModified,
veeamCapacity.LastModified,
'LastModified value mismatch',
);
done();
});
});
Expand Down Expand Up @@ -895,6 +908,9 @@ describe('MongoClientInterface, putObjectVerCase4', () => {
if (err) {
return done(err);
}

client.putObjectVerCase4Promised = promisify(client.putObjectVerCase4).bind(client);

return createBucket(client, bucketName, true, err => {
if (err) {
return done(err);
Expand Down Expand Up @@ -1102,6 +1118,65 @@ describe('MongoClientInterface, putObjectVerCase4', () => {
},
);
});

it('should handle missing versionId ($exists: false) in putObjectVerCase4 to update master', async () => {
const objName = 'test-object';
const versionId = 'test-version-id';
const objMD = new ObjectMD()
.setKey(objName)
.setDataStoreName('us-east-1')
.setContentLength(100)
.setLastModified(new Date());

const updateOneStub = sandbox.stub(collection, 'updateOne').resolves({ modifiedCount: 1 });

sandbox.stub(client, 'getLatestVersion').callsFake((c, objName, vFormat, log, cb) => {
cb(null, objMD.getValue());
});

const bulkWriteStub = sandbox.stub(collection, 'bulkWrite').resolves({
modifiedCount: 1,
upsertedCount: 1,
matchedCount: 1,
});

const params = {
vFormat: BucketVersioningKeyFormat.v1,
versionId,
repairMaster: true,
versioning: true,
needOplogUpdate: false,
originOp: 'test',
conditions: {},
};

const result = await client.putObjectVerCase4Promised(
collection,
bucketName,
objName,
objMD.getValue(),
params,
logger,
);

assert(result, 'Expected result on success');
assert.strictEqual(
result,
`{"versionId": "undefined"}`,
'Expected versionId in result',
);
assert(updateOneStub.calledOnce, 'Expected updateOne to be called');
assert(bulkWriteStub.calledOnce, 'Expected bulkWrite to be called');
const bulkOps = bulkWriteStub.firstCall.args[0];
const masterUpdateOp = bulkOps.find(
op => op.updateOne && op.updateOne.filter._id === formatMasterKey(objName, BucketVersioningKeyFormat.v1)
);
assert(masterUpdateOp, 'Expected master update operation');
assert(
masterUpdateOp.updateOne.filter.$or[0]['value.versionId'].$exists === false,
'Expected filter to check for non-existing versionId'
);
});
});

describe('MongoClientInterface, putObjectNoVer', () => {
Expand Down Expand Up @@ -1470,7 +1545,7 @@ describe('MongoClientInterface, writeUUIDIfNotExists', () => {

sandbox.stub(client, 'getCollection').returns(mockCollection);

client.writeUUIDIfNotExists('test-uuid', logger, (err) => {
client.writeUUIDIfNotExists('test-uuid', logger, err => {
try {
assert(err, 'Expected an error to be returned');
assert.strictEqual(err.code, 500, 'Expected 500 error code');
Expand All @@ -1491,7 +1566,7 @@ describe('MongoClientInterface, writeUUIDIfNotExists', () => {

sandbox.stub(client, 'getCollection').returns(mockCollection);

client.writeUUIDIfNotExists('test-uuid', logger, (err) => {
client.writeUUIDIfNotExists('test-uuid', logger, err => {
try {
assert(err, 'Expected an error to be returned');
assert.strictEqual(err.code, 409, 'Expected KeyAlreadyExists error');
Expand Down
Loading