aboutsummaryrefslogtreecommitdiff
path: root/src/model/migrate.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2024-02-22 12:28:21 +0100
committerAlex Auvolat <alex@adnab.me>2024-02-22 12:28:21 +0100
commitcff702a951cb5bb193c7a891ababfd1d962ae9ed (patch)
treef7747f950672246c1ecc079e50222a07d23bc635 /src/model/migrate.rs
parent7e212e20e02b9cdced52ce23111214c6285a095a (diff)
downloadgarage-cff702a951cb5bb193c7a891ababfd1d962ae9ed.tar.gz
garage-cff702a951cb5bb193c7a891ababfd1d962ae9ed.zip
[lock-createbucket] Add node-global lock for bucket/key operations (fix #723)lock-createbucket
Diffstat (limited to 'src/model/migrate.rs')
-rw-r--r--src/model/migrate.rs10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/model/migrate.rs b/src/model/migrate.rs
index 4c74b43b..8528382a 100644
--- a/src/model/migrate.rs
+++ b/src/model/migrate.rs
@@ -67,6 +67,8 @@ impl Migrate {
None
};
+ let helper = self.garage.locked_helper().await;
+
self.garage
.bucket_table
.insert(&Bucket {
@@ -84,14 +86,10 @@ impl Migrate {
})
.await?;
- self.garage
- .bucket_helper()
- .set_global_bucket_alias(bucket_id, &new_name)
- .await?;
+ helper.set_global_bucket_alias(bucket_id, &new_name).await?;
for (k, ts, perm) in old_bucket_p.authorized_keys.items().iter() {
- self.garage
- .bucket_helper()
+ helper
.set_bucket_key_permissions(
bucket_id,
k,