diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-06-08 17:50:00 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-06-08 17:50:00 +0200 |
| commit | 03e811bbbfca5a2467bb24ce1500c74661234947 (patch) | |
| tree | 3729a62911507c8219c3b7756a0a60af9ca1665c | |
| parent | ab374e71787b1da37e1f885e88090bbcbd53ec47 (diff) | |
| download | garage-03e811bbbfca5a2467bb24ce1500c74661234947.tar.gz garage-03e811bbbfca5a2467bb24ce1500c74661234947.zip | |
Call counter tables 'v2' because schema changed since last time
| -rw-r--r-- | src/model/index_counter.rs | 4 | ||||
| -rw-r--r-- | src/model/k2v/item_table.rs | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/model/index_counter.rs b/src/model/index_counter.rs index 313d8612..36e8172b 100644 --- a/src/model/index_counter.rs +++ b/src/model/index_counter.rs @@ -158,7 +158,7 @@ impl<T: CountedItem> IndexCounter<T> { let this = Arc::new(Self { this_node: system.id, 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"), propagate_tx, table: Table::new( @@ -346,6 +346,7 @@ impl<T: CountedItem> IndexCounter<T> { break; } + info!("zeroing old counters... ({})", hex::encode(&batch[0].0)); for (local_counter_k, local_counter) in batch { let mut local_counter = rmp_serde::decode::from_read_ref::<_, LocalCounterEntry<T>>(&local_counter)?; @@ -390,6 +391,7 @@ impl<T: CountedItem> IndexCounter<T> { break; } + info!("counting entries... ({})", hex::encode(&batch[0].0)); for (counted_entry_k, counted_entry) in batch { let counted_entry = counted_table.data.decode_entry(&counted_entry)?; diff --git a/src/model/k2v/item_table.rs b/src/model/k2v/item_table.rs index d02bdd26..baa1db4b 100644 --- a/src/model/k2v/item_table.rs +++ b/src/model/k2v/item_table.rs @@ -240,7 +240,7 @@ impl TableSchema for K2VItemTable { } 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 type CP = Uuid; |