diff options
| author | Alex <alex@adnab.me> | 2024-02-22 12:05:19 +0000 |
|---|---|---|
| committer | Alex <alex@adnab.me> | 2024-02-22 12:05:19 +0000 |
| commit | 74d0c47f21ae2f9998a7dcbca3a27e3cc51e70b6 (patch) | |
| tree | f7747f950672246c1ecc079e50222a07d23bc635 /src/model/migrate.rs | |
| parent | 7e212e20e02b9cdced52ce23111214c6285a095a (diff) | |
| parent | cff702a951cb5bb193c7a891ababfd1d962ae9ed (diff) | |
| download | garage-74d0c47f21ae2f9998a7dcbca3a27e3cc51e70b6.tar.gz garage-74d0c47f21ae2f9998a7dcbca3a27e3cc51e70b6.zip | |
Merge pull request 'Add node-global lock for bucket/key operations (fix #723)' (#728) from lock-createbucket into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/728
Diffstat (limited to 'src/model/migrate.rs')
| -rw-r--r-- | src/model/migrate.rs | 10 |
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, |