Skip to content

Make GCP Objectstore delete requests retryable #1768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yavor16 merged 2 commits into from
Jan 23, 2026
Merged

Make GCP Objectstore delete requests retryable #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be5f224
Make GCP Objectstore delete requests retryable
Yavor16 Jan 20, 2026
e7007ef
Fix comment
Yavor16 Jan 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions ...org/cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public GcpObjectStoreFileStorage(Map<String, Object> credentials) {
protected Storage createObjectStoreStorage(Map<String, Object> credentials) {
return StorageOptions.http()
.setCredentials(getGcpCredentialsSupplier(credentials))
.setStorageRetryStrategy(StorageRetryStrategy.getDefaultStorageRetryStrategy())
.setStorageRetryStrategy(StorageRetryStrategy.getUniformStorageRetryStrategy())
.setRetrySettings(
RetrySettings.newBuilder()
.setMaxAttempts(OBJECT_STORE_MAX_ATTEMPTS_CONFIG)
Expand Down Expand Up @@ -110,7 +110,19 @@ public List<FileEntry> getFileEntriesWithoutContent(List<FileEntry> fileEntries)

@Override
public void deleteFile(String id, String space) {
storage.delete(bucketName, id);
deleteFileWithGeneration(id);
}

private boolean deleteFileWithGeneration(String id) {
Blob blob = storage.get(bucketName, id);
if (blob == null) {
return false;
}
if (blob.getGeneration() == null) {
return storage.delete(bucketName, id);
}
//Without generationMatch the delete requests are not retried because a retry can "accidentally delete a newer object version"
return storage.delete(bucketName, id, Storage.BlobSourceOption.generationMatch(blob.getGeneration()));
}

@Override
Expand Down Expand Up @@ -212,8 +224,10 @@ private int removeBlobsByFilter(Predicate<? super Blob> filter) {
return deletedBlobsResults.size();
}

protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
return storage.delete(blobIds);
private List<Boolean> deleteBlobs(List<BlobId> blobIds) {
return blobIds.stream()
.map(blobId -> deleteFileWithGeneration(blobId.getName()))
.toList();
}

protected Set<String> getEntryNames(Predicate<? super Blob> filter) {
Expand Down
13 changes: 2 additions & 11 deletions ...cloudfoundry/multiapps/controller/persistence/services/GcpObjectStoreFileStorageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.UUID;

import com.google.cloud.storage.Blob;
import com.google.cloud.storage.BlobId;
import com.google.cloud.storage.BlobInfo;
Expand All @@ -16,6 +15,7 @@
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.springframework.http.MediaType;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

Expand All @@ -34,15 +34,6 @@ public void setUp() {
protected Storage createObjectStoreStorage(Map<String, Object> credentials) {
return storage;
}

@Override
protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
List<Boolean> deletedBlobsResults = new ArrayList<>();
for (BlobId blobId : blobIds) {
deletedBlobsResults.add(storage.delete(blobId));
}
return List.copyOf(deletedBlobsResults);
}
};
spaceId = UUID.randomUUID()
.toString();
Expand Down
Loading