diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-11-09 14:12:05 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-11-09 14:12:05 +0100 |
| commit | bfb1845fdc981a370539d641a5d80f438f184f07 (patch) | |
| tree | 180ec9bf0e6bdf4148c80304fd48c22d92cdcc10 /src/api/admin | |
| parent | 19ef1ec8e7fee3a6c670e6e35dfcc83f0801e604 (diff) | |
| download | garage-bfb1845fdc981a370539d641a5d80f438f184f07.tar.gz garage-bfb1845fdc981a370539d641a5d80f438f184f07.zip | |
layout: refactor to use a RwLock on LayoutHistory
Diffstat (limited to 'src/api/admin')
| -rw-r--r-- | src/api/admin/cluster.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/api/admin/cluster.rs b/src/api/admin/cluster.rs index f5483451..593bd778 100644 --- a/src/api/admin/cluster.rs +++ b/src/api/admin/cluster.rs @@ -210,7 +210,7 @@ pub async fn handle_update_cluster_layout( ) -> Result<Response<Body>, Error> { let updates = parse_json_body::<UpdateClusterLayoutRequest>(req).await?; - let mut layout = garage.system.cluster_layout().as_ref().clone(); + let mut layout = garage.system.cluster_layout().clone(); let mut roles = layout.current().roles.clone(); roles.merge(&layout.staging.get().roles); @@ -256,7 +256,7 @@ pub async fn handle_apply_cluster_layout( ) -> Result<Response<Body>, Error> { let param = parse_json_body::<ApplyLayoutRequest>(req).await?; - let layout = garage.system.cluster_layout().as_ref().clone(); + let layout = garage.system.cluster_layout().clone(); let (layout, msg) = layout.apply_staged_changes(Some(param.version))?; garage @@ -273,7 +273,7 @@ pub async fn handle_apply_cluster_layout( } pub async fn handle_revert_cluster_layout(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { - let layout = garage.system.cluster_layout().as_ref().clone(); + let layout = garage.system.cluster_layout().clone(); let layout = layout.revert_staged_changes()?; garage .system |