Merge branch 'w/8.5/bugfix/BB-450/replication' into tmp/octopus/w/8.6…

…/bugfix/BB-450/replication
scality · Oct 11, 2023 · b3a9dbe · b3a9dbe
2 parents 182b33c + 2dffcc9
commit b3a9dbe
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js b/extensions/lifecycle/tasks/LifecycleDeleteObjectTask.js
@@ -204,7 +204,7 @@ class LifecycleDeleteObjectTask extends BackbeatTask {
                 return done(err);
             }
             const replicationStatus = objMD.getReplicationStatus();
-            if (['PENDING', 'PROCESSING', 'FAILED'].includes(replicationStatus)) {
+            if (replicationStatus && replicationStatus !== 'COMPLETED') {
                 const error = new PendingReplicationError('object has a pending replication status');
                 return done(error);
             }

diff --git a/tests/unit/lifecycle/LifecycleDeleteObjectTask.spec.js b/tests/unit/lifecycle/LifecycleDeleteObjectTask.spec.js
@@ -104,12 +104,34 @@ describe('LifecycleDeleteObjectTask', () => {
     });
 
     [
-      'PENDING',
-      'PROCESSING',
-      'FAILED',
+        'COMPLETED',
+        undefined,
     ].forEach(status => {
-        it(`should skip replicating object : ${status}`, done => {
-            objMd.setReplicationStatus('PENDING');
+        it(`should delete replicating object with status: ${status}`, done => {
+            objMd.setReplicationStatus(status);
+            const entry = ActionQueueEntry.create('deleteObject')
+                .setAttribute('target.owner', 'testowner')
+                .setAttribute('target.bucket', 'testbucket')
+                .setAttribute('target.accountId', 'testid')
+                .setAttribute('target.key', 'testkey')
+                .setAttribute('target.version', 'testversion')
+                .setAttribute('details.lastModified', '2022-05-13T17:51:31.261Z');
+            s3Client.setResponse(null, {});
+            task.processActionEntry(entry, err => {
+                assert.strictEqual(s3Client.calls.deleteObject, 1);
+                assert.ifError(err);
+                done();
+            });
+        });
+    });
+
+    [
+        'PENDING',
+        'PROCESSING',
+        'FAILED',
+    ].forEach(status => {
+        it(`should skip replicating object with status: ${status}`, done => {
+            objMd.setReplicationStatus(status);
             const entry = ActionQueueEntry.create('deleteObject')
                 .setAttribute('target.owner', 'testowner')
                 .setAttribute('target.bucket', 'testbucket')