Compare commits

...

3 Commits

Author SHA1 Message Date
Maha Benzekri f5de4daebc
CLDSRV-548: bump project version 2024-07-15 15:25:01 +02:00
Maha Benzekri d851a2c645
CLDSRV-548: bump arsenal version 2024-07-15 15:22:20 +02:00
Maha Benzekri f011663585
CLDSRV-548: flag doesNeedOplogUpdate set up 2024-07-15 15:07:45 +02:00
4 changed files with 15 additions and 6 deletions

View File

@ -193,6 +193,11 @@ function createAndStoreObject(bucketName, bucketMD, objectKey, objMD, authInfo,
metadataStoreParams.oldReplayId = objMD.uploadId; metadataStoreParams.oldReplayId = objMD.uploadId;
} }
if (objMD && !bucketMD.isVersioningEnabled() && objMD?.archive?.archiveInfo) {
metadataStoreParams.needOplogUpdate = true;
metadataStoreParams.originOp = 's3:ReplaceArchivedObject';
}
/* eslint-disable camelcase */ /* eslint-disable camelcase */
const dontSkipBackend = externalBackends; const dontSkipBackend = externalBackends;
/* eslint-enable camelcase */ /* eslint-enable camelcase */

View File

@ -109,7 +109,7 @@ const services = {
tagging, taggingCopy, replicationInfo, defaultRetention, tagging, taggingCopy, replicationInfo, defaultRetention,
dataStoreName, creationTime, retentionMode, retentionDate, dataStoreName, creationTime, retentionMode, retentionDate,
legalHold, originOp, updateMicroVersionId, archive, oldReplayId, legalHold, originOp, updateMicroVersionId, archive, oldReplayId,
deleteNullKey, amzStorageClass, overheadField } = params; deleteNullKey, amzStorageClass, overheadField, needOplogUpdate } = params;
log.trace('storing object in metadata'); log.trace('storing object in metadata');
assert.strictEqual(typeof bucketName, 'string'); assert.strictEqual(typeof bucketName, 'string');
const md = new ObjectMD(); const md = new ObjectMD();
@ -176,6 +176,10 @@ const services = {
if (versionId || versionId === '') { if (versionId || versionId === '') {
options.versionId = versionId; options.versionId = versionId;
} }
if (needOplogUpdate) {
options.needOplogUpdate = true;
options.originOp = originOp;
}
if (uploadId) { if (uploadId) {
md.setUploadId(uploadId); md.setUploadId(uploadId);
options.replayId = uploadId; options.replayId = uploadId;

View File

@ -1,6 +1,6 @@
{ {
"name": "@zenko/cloudserver", "name": "@zenko/cloudserver",
"version": "8.8.27", "version": "8.8.28",
"description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol", "description": "Zenko CloudServer, an open-source Node.js implementation of a server handling the Amazon S3 protocol",
"main": "index.js", "main": "index.js",
"engines": { "engines": {
@ -21,7 +21,7 @@
"dependencies": { "dependencies": {
"@azure/storage-blob": "^12.12.0", "@azure/storage-blob": "^12.12.0",
"@hapi/joi": "^17.1.0", "@hapi/joi": "^17.1.0",
"arsenal": "git+https://github.com/scality/arsenal#8.1.130", "arsenal": "git+https://github.com/scality/arsenal#817bb836ec0e04fbf083b4c57e42e3986dcdc9bc",
"async": "~2.5.0", "async": "~2.5.0",
"aws-sdk": "2.905.0", "aws-sdk": "2.905.0",
"bucketclient": "scality/bucketclient#8.1.9", "bucketclient": "scality/bucketclient#8.1.9",

View File

@ -1040,9 +1040,9 @@ arraybuffer.slice@~0.0.7:
optionalDependencies: optionalDependencies:
ioctl "^2.0.2" ioctl "^2.0.2"
"arsenal@git+https://github.com/scality/arsenal#8.1.130": "arsenal@git+https://github.com/scality/arsenal#817bb836ec0e04fbf083b4c57e42e3986dcdc9bc":
version "8.1.130" version "8.1.133"
resolved "git+https://github.com/scality/arsenal#30eaaf15eb0d6e304c710b0a275410ae7c99d34d" resolved "git+https://github.com/scality/arsenal#817bb836ec0e04fbf083b4c57e42e3986dcdc9bc"
dependencies: dependencies:
"@azure/identity" "^3.1.1" "@azure/identity" "^3.1.1"
"@azure/storage-blob" "^12.12.0" "@azure/storage-blob" "^12.12.0"