diff options
Diffstat (limited to 'src/garage/cli')
| -rw-r--r-- | src/garage/cli/cmd.rs | 4 | ||||
| -rw-r--r-- | src/garage/cli/util.rs | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/garage/cli/cmd.rs b/src/garage/cli/cmd.rs index e8e834e8..3a0bd956 100644 --- a/src/garage/cli/cmd.rs +++ b/src/garage/cli/cmd.rs @@ -166,8 +166,8 @@ pub async fn cmd_admin( AdminRpc::Ok(msg) => { println!("{}", msg); } - AdminRpc::BucketList { buckets, counters } => { - print_bucket_list(buckets, counters); + AdminRpc::BucketList(bl) => { + print_bucket_list(bl); } AdminRpc::BucketInfo { bucket, diff --git a/src/garage/cli/util.rs b/src/garage/cli/util.rs index 28a34daa..329e8a3e 100644 --- a/src/garage/cli/util.rs +++ b/src/garage/cli/util.rs @@ -9,11 +9,11 @@ use garage_model::bucket_table::*; use garage_model::key_table::*; use garage_model::s3::object_table::{BYTES, OBJECTS, UNFINISHED_UPLOADS}; -pub fn print_bucket_list(buckets: Vec<Bucket>, counters: HashMap<Uuid, HashMap<String, i64>>) { +pub fn print_bucket_list(bl: Vec<Bucket>) { println!("List of buckets:"); let mut table = vec![]; - for bucket in buckets { + for bucket in bl { let aliases = bucket .aliases() .iter() @@ -31,18 +31,11 @@ pub fn print_bucket_list(buckets: Vec<Bucket>, counters: HashMap<Uuid, HashMap<S s => format!("[{} local aliases]", s.len()), }; - let empty_counters = HashMap::new(); - let cnt = counters.get(&bucket.id).unwrap_or(&empty_counters); - table.push(format!( - "\t{}\t{}\t{}\t{}\t{}\t{}", + "\t{}\t{}\t{}", aliases.join(","), local_aliases_n, hex::encode(bucket.id), - bytesize::ByteSize::b(cnt.get(BYTES).cloned().unwrap_or_default() as u64) - .to_string_as(true), - cnt.get(OBJECTS).cloned().unwrap_or_default(), - cnt.get(UNFINISHED_UPLOADS).cloned().unwrap_or_default(), )); } format_table(table); |