Merge branch 'improvement/CLDSRV-819' into q/9.3

Author: bert-e

.github/docker/docker-compose.yaml

@@ -96,7 +96,9 @@ services:
   ceph:
     network_mode: "host"
     profiles: ['ceph']
-    image: ghcr.io/scality/cloudserver/ci-ceph
+    image: ghcr.io/scality/cloudserver/ci-ceph 
+    volumes:
+      - /tmp/artifacts/${JOB_NAME}/ceph:/artifacts
   sproxyd:
     network_mode: "host"
     profiles: ['sproxyd']

examples/node-md-search.js

@@ -1,28 +1,46 @@
-const { S3 } = require('aws-sdk');
+const { S3Client, ListObjectsCommand } = require('@aws-sdk/client-s3');
+const { NodeHttpHandler } = require('@smithy/node-http-handler');
+const http = require('http');
+
 const config = {
-    sslEnabled: false,
     endpoint: 'http://127.0.0.1:8000',
-    signatureCache: false,
-    signatureVersion: 'v4',
     region: 'us-east-1',
-    s3ForcePathStyle: true,
-    accessKeyId: 'accessKey1',
-    secretAccessKey: 'verySecretKey1',
+    forcePathStyle: true,
+    credentials: {
+        accessKeyId: 'accessKey1',
+        secretAccessKey: 'verySecretKey1',
+    },
+    requestHandler: new NodeHttpHandler({
+        httpAgent: new http.Agent({ keepAlive: false }),
+    }),
 };
-const s3Client = new S3(config);
 
-const encodedSearch =
-    encodeURIComponent('x-amz-meta-color="blue"');
-const req = s3Client.listObjects({ Bucket: 'bucketname' });
+const s3Client = new S3Client(config);
+
+const encodedSearch = encodeURIComponent('x-amz-meta-color="blue"');
+
+const command = new ListObjectsCommand({ Bucket: 'bucketname' });
+
+command.middlewareStack.add(
+    next => async args => {
+        if (args.request && args.request.path) {
+            // eslint-disable-next-line no-param-reassign
+            args.request.path = `${args.request.path}?search=${encodedSearch}`;
+        }
+        return next(args);
+    },
+    {
+        step: 'build',
+        name: 'addSearchParameter',
+        priority: 'high'
+    }
+);
 
-// the build event
-req.on('build', () => {
-    req.httpRequest.path = `${req.httpRequest.path}?search=${encodedSearch}`;
-});
-req.on('success', res => {
-    process.stdout.write(`Result ${res.data}`);
-});
-req.on('error', err => {
-    process.stdout.write(`Error ${err}`);
-});
-req.send();
+// Send command and handle response
+s3Client.send(command)
+    .then(data => {
+        process.stdout.write(`Result ${JSON.stringify(data)}`);
+    })
+    .catch(err => {
+        process.stdout.write(`Error ${err}`);
+    });

lib/routes/routeBackbeat.js

@@ -712,6 +712,41 @@ function putMetadata(request, response, bucketInfo, objMd, log, callback) {
                 return metadata.putObjectMD(bucketName, objectKey, omVal, options, log,
                     (err, md) => {
                         if (err) {
+                            // Handle duplicate key error during repair operation
+                            // This can happen due to race conditions when multiple operations
+                            // try to repair the master version simultaneously. Since repair
+                            // is idempotent, if the master version already exists, we can
+                            // treat this as success.
+                            const errorMessage = err.message || err.toString() || '';
+                            const isRepairDuplicateKeyError = options.repairMaster &&
+                                (errorMessage.includes('E11000') ||
+                                 errorMessage.includes('duplicate key') ||
+                                 errorMessage.includes('repair'));
+                            
+                            if (isRepairDuplicateKeyError) {
+                                log.warn('duplicate key error during repair - treating as success', {
+                                    error: err,
+                                    method: 'putMetadata',
+                                    bucketName,
+                                    objectKey,
+                                    note: 'Repair operation is idempotent, master version already exists',
+                                });
+                                // Treat as success - the repair already completed
+                                // Get the current metadata to return
+                                return metadata.getObjectMD(bucketName, objectKey, {}, log,
+                                    (getErr, currentMD) => {
+                                        if (getErr) {
+                                            log.warn('could not retrieve metadata after repair duplicate key error', {
+                                                error: getErr,
+                                                method: 'putMetadata',
+                                            });
+                                            // Still treat as success since repair likely completed
+                                            return next(null, md || {});
+                                        }
+                                        return next(null, currentMD || md || {});
+                                    });
+                            }
+    
                             log.error('error putting object metadata', {
                                 error: err,
                                 method: 'putMetadata',
@@ -1521,7 +1556,7 @@ function routeBackbeatAPIProxy(request, response, requestContexts, log) {
             });
             return responseJSONBody(err, null, response, log);
         }
-        // We don't use the authorization results for now
+        // We don't use the authorization results for now  
         // as the UI uses the external Cloudserver instance
         // as a proxy to access the Backbeat API service.
 

package.json

@@ -19,11 +19,20 @@
   },
   "homepage": "https://github.com/scality/S3#readme",
   "dependencies": {
+    "@aws-sdk/client-iam": "^3.930.0",
+    "@aws-sdk/client-s3": "^3.908.0",
+    "@aws-sdk/client-sts": "^3.930.0",
+    "aws-sdk": "^2.1692.0",
+    "@aws-sdk/credential-providers": "^3.864.0",
+    "@aws-sdk/middleware-retry": "^3.374.0",
+    "@aws-sdk/protocol-http": "^3.374.0",
+    "@aws-sdk/s3-request-presigner": "^3.901.0",
+    "@aws-sdk/signature-v4": "^3.374.0",
     "@azure/storage-blob": "^12.28.0",
     "@hapi/joi": "^17.1.1",
-    "arsenal": "git+https://github.com/scality/Arsenal#8.2.43",
+    "@smithy/node-http-handler": "^3.0.0",
+    "arsenal": "git+https://github.com/scality/Arsenal#8.3.0-preview.1",
     "async": "2.6.4",
-    "aws-sdk": "^2.1692.0",
     "bucketclient": "scality/bucketclient#8.2.7",
     "bufferutil": "^4.0.8",
     "commander": "^12.1.0",
@@ -63,7 +72,7 @@
     "istanbul": "^0.4.5",
     "istanbul-api": "^3.0.0",
     "lolex": "^6.0.0",
-    "mocha": "^10.8.2",
+    "mocha": "^11.7.5",
     "mocha-junit-reporter": "^2.2.1",
     "mocha-multi-reporters": "^1.5.1",
     "node-mocks-http": "^1.16.1",