adding tests post reviews

scality · Jul 22, 2024 · 2f37bcd · 2f37bcd
1 parent 11f5370
commit 2f37bcd
Show file tree

Hide file tree

Showing 2 changed files with 109 additions and 1 deletion.
diff --git a/extensions/gc/tasks/GarbageCollectorTask.js b/extensions/gc/tasks/GarbageCollectorTask.js
@@ -134,7 +134,7 @@ class GarbageCollectorTask extends BackbeatTask {
         });
     }
 
-    _executeDeleteData(entry, log, done) {
+    _executeDeleteDataOnce(entry, log, done) {
         const { locations } = entry.getAttribute('target');
         const ruleType = entry.getContextAttribute('ruleType');
         const params = {
@@ -184,6 +184,24 @@ class GarbageCollectorTask extends BackbeatTask {
         });
     }
 
+    _executeDeleteData(entry, log, done) {
+        const logFields = {
+            bucket: entry.getAttribute('source.bucket'),
+            objectKey: entry.getAttribute('source.objectKey'),
+            storageClass: entry.getAttribute('source.storageClass'),
+            ruleType: entry.getContextAttribute('ruleType'),
+        };
+
+        this.retry({
+            actionDesc: 'execute delete data',
+            logFields,
+            maxRetries: 2,
+            actionFunc: cb => this._executeDeleteDataOnce(entry, log, cb),
+            shouldRetryFunc: err => err.retryable,
+            log,
+        }, done);
+    }
+
     _deleteArchivedSourceDataOnce(entry, log, done) {
         const { bucket, key, version, oldLocation, newLocation } = entry.getAttribute('target');
 

diff --git a/tests/unit/gc/GarbageCollectorTask.spec.js b/tests/unit/gc/GarbageCollectorTask.spec.js
@@ -266,4 +266,94 @@ describe('GarbageCollectorTask', () => {
             done();
         });
     });
+
+    it('should delete data', done => {
+        backbeatClient.batchDeleteResponse = { error: null, res: null };
+
+        const entry = ActionQueueEntry.create('deleteData')
+            .addContext({
+                origin: 'lifecycle',
+                ruleType: 'expiration',
+                bucketName: bucket,
+                objectKey: key,
+                versionId: version,
+            })
+            .setAttribute('serviceName', 'lifecycle-expiration')
+            .setAttribute('target', {
+                bucket: bucket,
+                key: version,
+                version: key,
+                accountId: accountId,
+                owner: owner,
+                locations: [{ 
+                    key: 'locationKey',
+                    dataStoreName: 'dataStoreName',
+                    size: 'size',
+                    dataStoreVersionId: 'dataStoreVersionId',
+                }],
+            });
+        mdObj.setLocation(loc)
+            .setDataStoreName('locationName')
+            .setAmzStorageClass('STANDARD');
+
+        backbeatMetadataProxyClient.setMdObj(mdObj);
+
+        const batchDeleteDataSpy = sinon.spy(gcTask, '_batchDeleteData');
+
+        gcTask.processActionEntry(entry, (err, commitInfo) => {
+            assert.ifError(err);
+            assert.strictEqual(commitInfo, undefined);
+
+            const updatedMD = backbeatMetadataProxyClient.mdObj;
+            assert.deepStrictEqual(updatedMD.getLocation(), loc);
+            assert.strictEqual(updatedMD.getDataStoreName(), 'locationName');
+            assert.strictEqual(updatedMD.getAmzStorageClass(), 'STANDARD');
+
+            assert.strictEqual(batchDeleteDataSpy.callCount, 1);
+            batchDeleteDataSpy.restore();
+            done();
+        });
+    });
+
+    it('should retry delete operation if gc failed with retryable error', done => {
+        backbeatClient.batchDeleteResponse = { error: { statusCode: 500, retryable: true }, res: null };
+
+        const entry = ActionQueueEntry.create('deleteData')
+            .addContext({
+                origin: 'lifecycle',
+                ruleType: 'expiration',
+                bucketName: bucket,
+                objectKey: key,
+                versionId: version,
+            })
+            .setAttribute('serviceName', 'lifecycle-expiration')
+            .setAttribute('target', {
+                bucket: bucket,
+                key: version,
+                version: key,
+                accountId: accountId,
+                owner: owner,
+                locations: [{ 
+                    key: 'locationKey',
+                    dataStoreName: 'dataStoreName',
+                    size: 'size',
+                    dataStoreVersionId: 'dataStoreVersionId',
+                }],
+            });
+        mdObj.setLocation(loc)
+            .setDataStoreName('locationName')
+            .setAmzStorageClass('STANDARD');
+
+        backbeatMetadataProxyClient.setMdObj(mdObj);
+
+        const batchDeleteDataSpy = sinon.spy(gcTask, '_batchDeleteData');
+
+        gcTask.processActionEntry(entry, (err) => {
+            assert.strictEqual(batchDeleteDataSpy.callCount, 3);
+            assert.strictEqual(err.statusCode, 500);
+            batchDeleteDataSpy.restore();
+            done();
+        });
+    });
+
 });