diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-05-04 11:49:23 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-06-09 16:23:37 +0200 |
| commit | 511e07ecd489fa72040171fe908323873a57ac19 (patch) | |
| tree | e4fe58d387f8cb3c913e4bfad8c1472151fc8d88 /src/garage/admin | |
| parent | 4ea53dc75930d813b84b79c3427b194b6e664ce7 (diff) | |
| download | garage-511e07ecd489fa72040171fe908323873a57ac19.tar.gz garage-511e07ecd489fa72040171fe908323873a57ac19.zip | |
fix mpu counter (add missing workers) and report info at appropriate places
Diffstat (limited to 'src/garage/admin')
| -rw-r--r-- | src/garage/admin/bucket.rs | 10 | ||||
| -rw-r--r-- | src/garage/admin/mod.rs | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/garage/admin/bucket.rs b/src/garage/admin/bucket.rs index 11bb8730..0781cb8b 100644 --- a/src/garage/admin/bucket.rs +++ b/src/garage/admin/bucket.rs @@ -73,6 +73,15 @@ impl AdminRpcHandler { .map(|x| x.filtered_values(&self.garage.system.ring.borrow())) .unwrap_or_default(); + let mpu_counters = self + .garage + .mpu_counter_table + .table + .get(&bucket_id, &EmptyKey) + .await? + .map(|x| x.filtered_values(&self.garage.system.ring.borrow())) + .unwrap_or_default(); + let mut relevant_keys = HashMap::new(); for (k, _) in bucket .state @@ -112,6 +121,7 @@ impl AdminRpcHandler { bucket, relevant_keys, counters, + mpu_counters, }) } diff --git a/src/garage/admin/mod.rs b/src/garage/admin/mod.rs index 07b0012d..33c21eba 100644 --- a/src/garage/admin/mod.rs +++ b/src/garage/admin/mod.rs @@ -53,6 +53,7 @@ pub enum AdminRpc { bucket: Bucket, relevant_keys: HashMap<String, Key>, counters: HashMap<String, i64>, + mpu_counters: HashMap<String, i64>, }, KeyList(Vec<(String, String)>), KeyInfo(Key, HashMap<Uuid, Bucket>), |