Deuxfleurs/garage
48
55
Fork 73
Code Issues 100 Pull requests 14 Releases 30 Wiki Activity

improve internal item counter mechanisms and implement bucket quotas #326

Merged
lx merged 23 commits from counters into main 2022-06-15 18:20:31 +00:00
Conversation 1 Commits 23 Files changed 32 +7 -12
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ffe05c3c7d - Show all commits

19
src/garage/cli/util.rs
View file

@ -31,23 +31,18 @@ pub fn print_bucket_list(buckets: Vec<Bucket>, counters: HashMap<Uuid, HashMap<S
s => format!("[{} local aliases]", s.len()), s => format!("[{} local aliases]", s.len()),
}; };
let counters_tb = match counters.get(&bucket.id) { let empty_counters = HashMap::new();
Some(c) => format!( let cnt = counters.get(&bucket.id).unwrap_or(&empty_counters);
"\t{}\t{}\t{}",
bytesize::ByteSize::b(c.get(BYTES).cloned().unwrap_or_default() as u64)
.to_string_as(true),
c.get(OBJECTS).cloned().unwrap_or_default(),
c.get(UNFINISHED_UPLOADS).cloned().unwrap_or_default(),
),
None => "".into(),
};
table.push(format!( table.push(format!(
"\t{}\t{}\t{}{}", "\t{}\t{}\t{}\t{}\t{}\t{}",
aliases.join(","), aliases.join(","),
local_aliases_n, local_aliases_n,
hex::encode(bucket.id), hex::encode(bucket.id),
counters_tb 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); format_table(table);