Preserve the pending restore request on archive completion

The archive completion write replaced the whole archive block with the
archiveInfo returned by the cold backend, dropping a restore request
recorded while the object was still awaiting its first archive: the
queue populator would then see the completion write with no request to
act upon, and the restore would stay pending forever.

Issue: BB-804

Author: francoisferrand

extensions/lifecycle/tasks/LifecycleColdStatusArchiveTask.js

@@ -108,8 +108,14 @@ class LifecycleColdStatusArchiveTask extends LifecycleUpdateTransitionTask {
             next => {
                 const transitionTime = objectMD.getTransitionTime();
 
-                // set new ObjectMDArchive to ObjectMD
-                objectMD.setArchive(new ObjectMDArchive(entry.archiveInfo));
+                // set new ObjectMDArchive to ObjectMD, but make sure to keep any (deferred)
+                // restore request
+                const archive = objectMD.getArchive();
+                objectMD.setArchive(new ObjectMDArchive(
+                    entry.archiveInfo,
+                    archive?.restoreRequestedAt,
+                    archive?.restoreRequestedDays,
+                ));
                 objectMD.setOriginOp('s3:LifecycleTransition:SetArchive');
 
                 if (skipLocationDeletion) {

tests/unit/gc/GarbageCollectorTask.spec.js

@@ -127,7 +127,12 @@ describe('GarbageCollectorTask', () => {
         mdObj.setLocation(loc)
             .setDataStoreName('old-location')
             .setAmzStorageClass('new-location')
-            .setTransitionInProgress(true);
+            .setTransitionInProgress(true)
+            .setArchive({
+                archiveInfo: { archiveId: 'da80b6dc-280d-4dce-83b5-d5b40276e321' },
+                restoreRequestedAt: '2017-07-11T02:44:25.515Z',
+                restoreRequestedDays: 3,
+            });
         backbeatMetadataProxyClient.setMdObj(mdObj);
 
         gcTask.processActionEntry(entry, err => {
@@ -137,6 +142,11 @@ describe('GarbageCollectorTask', () => {
             assert.strictEqual(updatedMD.getDataStoreName(), 'new-location');
             assert.strictEqual(updatedMD.getTransitionInProgress(), false);
             assert.strictEqual(updatedMD.getOriginOp(), 's3:LifecycleTransition:Direct');
+            assert.deepStrictEqual(updatedMD.getArchive(), {
+                archiveInfo: { archiveId: 'da80b6dc-280d-4dce-83b5-d5b40276e321' },
+                restoreRequestedAt: '2017-07-11T02:44:25.515Z',
+                restoreRequestedDays: 3,
+            });
             done();
         });
     });

tests/unit/lifecycle/LifecycleColdStatusArchiveTask.spec.js

@@ -165,6 +165,37 @@ describe('LifecycleColdStatusArchiveTask', () => {
         });
     });
 
+    it('should keep a restore requested during the archive window', done => {
+        backbeatClient.batchDeleteResponse = { error: { statusCode: 404 }, res: null };
+
+        const entry = ColdStorageStatusQueueEntry.createFromKafkaEntry({ value: message });
+        mdObj.setLocation()
+            .setDataStoreName('us-east-1')
+            .setAmzStorageClass(coldLocation);
+        // setArchive() requires archiveInfo, which the object does not have yet
+        mdObj.getValue().archive = {
+            restoreRequestedAt: '2017-07-11T02:44:25.515Z',
+            restoreRequestedDays: 3,
+        };
+        backbeatMetadataProxyClient.setMdObj(mdObj);
+
+        archiveTask.processEntry(coldLocation, entry, err => {
+            assert.ifError(err);
+
+            const updatedMD = backbeatMetadataProxyClient.getReceivedMd();
+            assert.strictEqual(updatedMD.originOp, 's3:LifecycleTransition:Direct');
+            assert.deepStrictEqual(updatedMD.archive, {
+                archiveInfo: {
+                    archiveId: 'da80b6dc-280d-4dce-83b5-d5b40276e321',
+                    archiveVersion: 5166759712787974,
+                },
+                restoreRequestedAt: '2017-07-11T02:44:25.515Z',
+                restoreRequestedDays: 3,
+            });
+            done();
+        });
+    });
+
     it('should send kafka entry to delete orphan cold object when source object was deleted', done => {
         const entry = ColdStorageStatusQueueEntry.createFromKafkaEntry({ value: message });