aboutsummaryrefslogtreecommitdiff
path: root/src/garage/admin/mod.rs
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2023-11-08 16:41:00 +0100
committerAlex Auvolat <alex@adnab.me>2023-11-08 16:41:00 +0100
commit4a9c94514f49aa4e9880a8e0f5cf5a52d11ae993 (patch)
tree40a54f544efc25dc7973f0e3766bb396feebbc24 /src/garage/admin/mod.rs
parent12d1dbfc6b884be488e2d79c0b9e3c47490f5442 (diff)
downloadgarage-4a9c94514f49aa4e9880a8e0f5cf5a52d11ae993.tar.gz
garage-4a9c94514f49aa4e9880a8e0f5cf5a52d11ae993.zip
avoid using layout_watch in System directly
Diffstat (limited to 'src/garage/admin/mod.rs')
-rw-r--r--src/garage/admin/mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/garage/admin/mod.rs b/src/garage/admin/mod.rs
index 006f71cd..c3fa801a 100644
--- a/src/garage/admin/mod.rs
+++ b/src/garage/admin/mod.rs
@@ -126,7 +126,7 @@ impl AdminRpcHandler {
opt_to_send.all_nodes = false;
let mut failures = vec![];
- let layout = self.garage.system.layout_watch.borrow().clone();
+ let layout = self.garage.system.cluster_layout().clone();
for node in layout.node_ids().iter() {
let node = (*node).into();
let resp = self
@@ -163,7 +163,7 @@ impl AdminRpcHandler {
async fn handle_stats(&self, opt: StatsOpt) -> Result<AdminRpc, Error> {
if opt.all_nodes {
let mut ret = String::new();
- let layout = self.garage.system.layout_watch.borrow().clone();
+ let layout = self.garage.system.cluster_layout().clone();
for node in layout.node_ids().iter() {
let mut opt = opt.clone();
@@ -275,7 +275,7 @@ impl AdminRpcHandler {
let mut ret = String::new();
// Gather storage node and free space statistics
- let layout = &self.garage.system.layout_watch.borrow();
+ let layout = &self.garage.system.cluster_layout();
let mut node_partition_count = HashMap::<Uuid, u64>::new();
for short_id in layout.ring_assignment_data.iter() {
let id = layout.node_id_vec[*short_id as usize];
@@ -440,7 +440,7 @@ impl AdminRpcHandler {
) -> Result<AdminRpc, Error> {
if all_nodes {
let mut ret = vec![];
- let layout = self.garage.system.layout_watch.borrow().clone();
+ let layout = self.garage.system.cluster_layout().clone();
for node in layout.node_ids().iter() {
let node = (*node).into();
match self
@@ -488,7 +488,7 @@ impl AdminRpcHandler {
) -> Result<AdminRpc, Error> {
if all_nodes {
let mut ret = vec![];
- let layout = self.garage.system.layout_watch.borrow().clone();
+ let layout = self.garage.system.cluster_layout().clone();
for node in layout.node_ids().iter() {
let node = (*node).into();
match self