diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-11-08 16:41:00 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-11-08 16:41:00 +0100 |
| commit | 4a9c94514f49aa4e9880a8e0f5cf5a52d11ae993 (patch) | |
| tree | 40a54f544efc25dc7973f0e3766bb396feebbc24 /src/api | |
| parent | 12d1dbfc6b884be488e2d79c0b9e3c47490f5442 (diff) | |
| download | garage-4a9c94514f49aa4e9880a8e0f5cf5a52d11ae993.tar.gz garage-4a9c94514f49aa4e9880a8e0f5cf5a52d11ae993.zip | |
avoid using layout_watch in System directly
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/admin/bucket.rs | 4 | ||||
| -rw-r--r-- | src/api/admin/cluster.rs | 10 | ||||
| -rw-r--r-- | src/api/k2v/index.rs | 2 | ||||
| -rw-r--r-- | src/api/s3/put.rs | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/api/admin/bucket.rs b/src/api/admin/bucket.rs index 6bff7e9f..65929d61 100644 --- a/src/api/admin/bucket.rs +++ b/src/api/admin/bucket.rs @@ -122,7 +122,7 @@ async fn bucket_info_results( .table .get(&bucket_id, &EmptyKey) .await? - .map(|x| x.filtered_values(&garage.system.layout_watch.borrow())) + .map(|x| x.filtered_values(&garage.system.cluster_layout())) .unwrap_or_default(); let mpu_counters = garage @@ -130,7 +130,7 @@ async fn bucket_info_results( .table .get(&bucket_id, &EmptyKey) .await? - .map(|x| x.filtered_values(&garage.system.layout_watch.borrow())) + .map(|x| x.filtered_values(&garage.system.cluster_layout())) .unwrap_or_default(); let mut relevant_keys = HashMap::new(); diff --git a/src/api/admin/cluster.rs b/src/api/admin/cluster.rs index c8107b82..01ff9885 100644 --- a/src/api/admin/cluster.rs +++ b/src/api/admin/cluster.rs @@ -33,7 +33,7 @@ pub async fn handle_get_cluster_status(garage: &Arc<Garage>) -> Result<Response< hostname: i.status.hostname, }) .collect(), - layout: format_cluster_layout(&garage.system.get_cluster_layout()), + layout: format_cluster_layout(&garage.system.cluster_layout()), }; Ok(json_ok_response(&res)?) @@ -84,7 +84,7 @@ pub async fn handle_connect_cluster_nodes( } pub async fn handle_get_cluster_layout(garage: &Arc<Garage>) -> Result<Response<Body>, Error> { - let res = format_cluster_layout(&garage.system.get_cluster_layout()); + let res = format_cluster_layout(&garage.system.cluster_layout()); Ok(json_ok_response(&res)?) } @@ -207,7 +207,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.get_cluster_layout(); + let mut layout = garage.system.cluster_layout().as_ref().clone(); let mut roles = layout.roles.clone(); roles.merge(&layout.staging_roles); @@ -247,7 +247,7 @@ pub async fn handle_apply_cluster_layout( ) -> Result<Response<Body>, Error> { let param = parse_json_body::<ApplyRevertLayoutRequest>(req).await?; - let layout = garage.system.get_cluster_layout(); + let layout = garage.system.cluster_layout().as_ref().clone(); let (layout, msg) = layout.apply_staged_changes(Some(param.version))?; garage.system.update_cluster_layout(&layout).await?; @@ -265,7 +265,7 @@ pub async fn handle_revert_cluster_layout( ) -> Result<Response<Body>, Error> { let param = parse_json_body::<ApplyRevertLayoutRequest>(req).await?; - let layout = garage.system.get_cluster_layout(); + let layout = garage.system.cluster_layout().as_ref().clone(); let layout = layout.revert_staged_changes(Some(param.version))?; garage.system.update_cluster_layout(&layout).await?; diff --git a/src/api/k2v/index.rs b/src/api/k2v/index.rs index ff8beda3..3fc39de6 100644 --- a/src/api/k2v/index.rs +++ b/src/api/k2v/index.rs @@ -26,7 +26,7 @@ pub async fn handle_read_index( ) -> Result<Response<Body>, Error> { let reverse = reverse.unwrap_or(false); - let layout: Arc<ClusterLayout> = garage.system.layout_watch.borrow().clone(); + let layout: Arc<ClusterLayout> = garage.system.cluster_layout().clone(); let (partition_keys, more, next_start) = read_range( &garage.k2v.counter_table.table, diff --git a/src/api/s3/put.rs b/src/api/s3/put.rs index fc17ed03..d1c88a76 100644 --- a/src/api/s3/put.rs +++ b/src/api/s3/put.rs @@ -253,7 +253,7 @@ pub(crate) async fn check_quotas( .await?; let counters = counters - .map(|x| x.filtered_values(&garage.system.layout_watch.borrow())) + .map(|x| x.filtered_values(&garage.system.cluster_layout())) .unwrap_or_default(); let (prev_cnt_obj, prev_cnt_size) = match prev_object { |