gsadmin/garage
1
0
Fork 0
mirror of https://github.com/deuxfleurs-org/garage.git synced 2026-08-18 09:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

more resilience to inconsistent alias states

Browse Source
This commit is contained in:
Alex Auvolat
2025-03-18 11:35:55 +01:00
parent be16bc7a05
commit 2ade8c86f6
3 changed files with 84 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/admin/bucket.rs
+1 -1
View File
@@ -382,7 +382,7 @@ pub async fn handle_delete_bucket(
for ((key_id, alias), _, active) in state.local_aliases.items().iter() {
if *active {
helper
.unset_local_bucket_alias(bucket.id, key_id, alias)
.purge_local_bucket_alias(bucket.id, key_id, alias)
.await?;
}
}
src/api/s3/bucket.rs
+2 -2
View File
@@ -241,11 +241,11 @@ pub async fn handle_delete_bucket(ctx: ReqCtx) -> Result<Response<ResBody>, Erro
// 1. delete bucket alias
if is_local_alias {
helper
.unset_local_bucket_alias(*bucket_id, &api_key.key_id, bucket_name)
.purge_local_bucket_alias(*bucket_id, &api_key.key_id, bucket_name)
.await?;
} else {
helper
.unset_global_bucket_alias(*bucket_id, bucket_name)
.purge_global_bucket_alias(*bucket_id, bucket_name)
.await?;
}