From 9b658dda18cb2431e3b77f3f1011d0310294bf20 Mon Sep 17 00:00:00 2001
From: Simon Detheridge <s@sd.ai>
Date: Mon, 16 Mar 2020 15:53:45 +0000
Subject: [PATCH] Copy-on-delete before unlocking

---
 services/filestore/app/js/GcsPersistor.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/filestore/app/js/GcsPersistor.js b/services/filestore/app/js/GcsPersistor.js
index bc46153983..ddaf37d42d 100644
--- a/services/filestore/app/js/GcsPersistor.js
+++ b/services/filestore/app/js/GcsPersistor.js
@@ -179,9 +179,6 @@ async function deleteFile(bucketName, key) {
   try {
     const file = storage.bucket(bucketName).file(key)
 
-    if (settings.filestore.gcs.unlockBeforeDelete) {
-      await file.setMetadata({ eventBasedHold: false })
-    }
     if (settings.filestore.gcs.deletedBucketSuffix) {
       await file.copy(
         storage
@@ -189,6 +186,9 @@ async function deleteFile(bucketName, key) {
           .file(`${key}-${new Date()}`)
       )
     }
+    if (settings.filestore.gcs.unlockBeforeDelete) {
+      await file.setMetadata({ eventBasedHold: false })
+    }
     await file.delete()
   } catch (err) {
     const error = PersistorHelper.wrapError(