Skip to content

Fix GCP sdk problem with cleaner #1741

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 1 commit into from
Nov 28, 2025
Merged

Fix GCP sdk problem with cleaner #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 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 @@ -26,7 +26,6 @@
import com.google.cloud.storage.StorageException;
import com.google.cloud.storage.StorageOptions;
import com.google.cloud.storage.StorageRetryStrategy;
import org.cloudfoundry.multiapps.common.util.MiscUtil;
import org.cloudfoundry.multiapps.controller.persistence.Messages;
import org.cloudfoundry.multiapps.controller.persistence.model.FileEntry;
import org.cloudfoundry.multiapps.controller.persistence.util.ObjectStoreFilter;
Expand Down Expand Up @@ -200,17 +199,21 @@ public Set<Blob> getAllEntries() {
.collect(Collectors.toSet());
}

protected int removeBlobsByFilter(Predicate<? super Blob> filter) {
private int removeBlobsByFilter(Predicate<? super Blob> filter) {
List<BlobId> blobIds = getEntryNames(filter).stream()
.map(entry -> BlobId.of(bucketName, entry))
.toList();
List<Boolean> deletedBlobsResults = new ArrayList<>();
if (!blobIds.isEmpty()) {
deletedBlobsResults = storage.delete(blobIds);
deletedBlobsResults = deleteBlobs(blobIds);
}
return MiscUtil.cast(deletedBlobsResults.stream()
.filter(Boolean::booleanValue)
.count());

deletedBlobsResults.removeIf(Boolean.FALSE::equals);
return deletedBlobsResults.size();
}

protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
return storage.delete(blobIds);
}

protected Set<String> getEntryNames(Predicate<? super Blob> filter) {
Expand Down
15 changes: 7 additions & 8 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,10 @@
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.Set;
import java.util.UUID;
import java.util.function.Predicate;

import com.google.cloud.storage.Blob;
import com.google.cloud.storage.BlobId;
Expand Down Expand Up @@ -38,13 +38,12 @@ protected Storage createObjectStoreStorage(Map<String, Object> credentials) {
}

@Override
protected int removeBlobsByFilter(Predicate<? super Blob> filter) {
Set<String> entries = getEntryNames(filter);
for (String entry : entries) {
storage.delete(CONTAINER, entry);
protected List<Boolean> deleteBlobs(List<BlobId> blobIds) {
List<Boolean> deletedBlobsResults = new ArrayList<>();
for (BlobId blobId : blobIds) {
deletedBlobsResults.add(storage.delete(blobId));
}

return entries.size();
return deletedBlobsResults;
}
};
spaceId = UUID.randomUUID()
Expand Down
Loading