Deuxfleurs/garage
41
56
Fork 73
Code Issues 98 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 +4 -2
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 03e811bbbf - Show all commits

4
src/model/index_counter.rs
View file

@ -158,7 +158,7 @@ impl<T: CountedItem> IndexCounter<T> {
let this = Arc::new(Self { let this = Arc::new(Self {
this_node: system.id, this_node: system.id,
local_counter: db local_counter: db
.open_tree(format!("local_counter:{}", T::COUNTER_TABLE_NAME)) .open_tree(format!("local_counter_v2:{}", T::COUNTER_TABLE_NAME))
.expect("Unable to open local counter tree"), .expect("Unable to open local counter tree"),
propagate_tx, propagate_tx,
table: Table::new( table: Table::new(
@ -346,6 +346,7 @@ impl<T: CountedItem> IndexCounter<T> {
break; break;
} }
info!("zeroing old counters... ({})", hex::encode(&batch[0].0));
for (local_counter_k, local_counter) in batch { for (local_counter_k, local_counter) in batch {
let mut local_counter = let mut local_counter =
rmp_serde::decode::from_read_ref::<_, LocalCounterEntry<T>>(&local_counter)?; rmp_serde::decode::from_read_ref::<_, LocalCounterEntry<T>>(&local_counter)?;
@ -390,6 +391,7 @@ impl<T: CountedItem> IndexCounter<T> {
break; break;
} }
info!("counting entries... ({})", hex::encode(&batch[0].0));
for (counted_entry_k, counted_entry) in batch { for (counted_entry_k, counted_entry) in batch {
let counted_entry = counted_table.data.decode_entry(&counted_entry)?; let counted_entry = counted_table.data.decode_entry(&counted_entry)?;

2
src/model/k2v/item_table.rs
View file

@ -240,7 +240,7 @@ impl TableSchema for K2VItemTable {
} }
impl CountedItem for K2VItem { impl CountedItem for K2VItem {
const COUNTER_TABLE_NAME: &'static str = "k2v_index_counter"; const COUNTER_TABLE_NAME: &'static str = "k2v_index_counter_v2";
// Partition key = bucket id // Partition key = bucket id
type CP = Uuid; type CP = Uuid;