From 9c07bcbbad5685d46ccca30453f0d9b5730d2b0d Mon Sep 17 00:00:00 2001
From: Yavor16 <yavoruzbg@gmail.com>
Date: Tue, 20 Jan 2026 14:12:30 +0200
Subject: [PATCH] Make GCP Objectstore delete requests retryable

---
 .../persistence/services/GcpObjectStoreFileStorage.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java
index f3722cb5cf..5b85b22033 100644
--- a/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java
+++ b/multiapps-controller-persistence/src/main/java/org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java
@@ -110,7 +110,8 @@ public List<FileEntry> getFileEntriesWithoutContent(List<FileEntry> fileEntries)
 
     @Override
     public void deleteFile(String id, String space) {
-        storage.delete(bucketName, id);
+        //Without generationMatch the delete requests are not retried because a retry can "accidentally delete a newer object version"
+        storage.delete(bucketName, id, Storage.BlobSourceOption.generationMatch());
     }
 
     @Override