Deuxfleurs/garage
41
56
Fork 73
Code Issues 98 Pull requests 14 Releases 30 Wiki Activity

Revert "Change object counter table to use full replication"

Browse source 
This reverts commit bc29d77ed3.
This commit is contained in:
Alex 2022-06-10 11:23:40 +02:00
parent bc29d77ed3
commit c054de43dd
Signed by: lx
GPG key ID: 0E496D15096376BE
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/model/garage.rs
View file

@ -52,8 +52,8 @@ pub struct Garage {
/// Table containing S3 objects /// Table containing S3 objects
pub object_table: Arc<Table<ObjectTable, TableShardedReplication>>, pub object_table: Arc<Table<ObjectTable, TableShardedReplication>>,
/// Counting table containing object counters for each bucket /// Counting table containing object counters
pub object_counter_table: Arc<IndexCounter<Object, TableFullReplication>>, pub object_counter_table: Arc<IndexCounter<Object>>,
/// Table containing S3 object versions /// Table containing S3 object versions
pub version_table: Arc<Table<VersionTable, TableShardedReplication>>, pub version_table: Arc<Table<VersionTable, TableShardedReplication>>,
/// Table containing S3 block references (not blocks themselves) /// Table containing S3 block references (not blocks themselves)
@ -68,7 +68,7 @@ pub struct GarageK2V {
/// Table containing K2V items /// Table containing K2V items
pub item_table: Arc<Table<K2VItemTable, TableShardedReplication>>, pub item_table: Arc<Table<K2VItemTable, TableShardedReplication>>,
/// Indexing table containing K2V item counters /// Indexing table containing K2V item counters
pub counter_table: Arc<IndexCounter<K2VItem, TableShardedReplication>>, pub counter_table: Arc<IndexCounter<K2VItem>>,
/// K2V RPC handler /// K2V RPC handler
pub rpc: Arc<K2VRpcHandler>, pub rpc: Arc<K2VRpcHandler>,
} }
@ -176,7 +176,7 @@ impl Garage {
&db, &db,
); );
info!("Initialize key_table_table..."); info!("Initialize key_table_table...");
let key_table = Table::new(KeyTable, control_rep_param.clone(), system.clone(), &db); let key_table = Table::new(KeyTable, control_rep_param, system.clone(), &db);
// ---- S3 tables ---- // ---- S3 tables ----
info!("Initialize block_ref_table..."); info!("Initialize block_ref_table...");
@ -201,7 +201,7 @@ impl Garage {
); );
info!("Initialize object counter table..."); info!("Initialize object counter table...");
let object_counter_table = IndexCounter::new(system.clone(), control_rep_param, &db); let object_counter_table = IndexCounter::new(system.clone(), meta_rep_param.clone(), &db);
info!("Initialize object_table..."); info!("Initialize object_table...");
#[allow(clippy::redundant_clone)] #[allow(clippy::redundant_clone)]

8
src/model/index_counter.rs
View file

@ -138,17 +138,17 @@ impl<T: CountedItem> TableSchema for CounterTable<T> {
// ---- // ----
pub struct IndexCounter<T: CountedItem, R: TableReplication + 'static> { pub struct IndexCounter<T: CountedItem> {
this_node: Uuid, this_node: Uuid,
local_counter: db::Tree, local_counter: db::Tree,
propagate_tx: mpsc::UnboundedSender<(T::CP, T::CS, LocalCounterEntry<T>)>, propagate_tx: mpsc::UnboundedSender<(T::CP, T::CS, LocalCounterEntry<T>)>,
pub table: Arc<Table<CounterTable<T>, R>>, pub table: Arc<Table<CounterTable<T>, TableShardedReplication>>,
} }
impl<T: CountedItem, R: TableReplication + 'static> IndexCounter<T, R> { impl<T: CountedItem> IndexCounter<T> {
pub fn new( pub fn new(
system: Arc<System>, system: Arc<System>,
replication: R, replication: TableShardedReplication,
db: &db::Db, db: &db::Db,
) -> Arc<Self> { ) -> Arc<Self> {
let background = system.background.clone(); let background = system.background.clone();

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

@ -6,7 +6,6 @@ use garage_db as db;
use garage_util::data::*; use garage_util::data::*;
use garage_table::crdt::*; use garage_table::crdt::*;
use garage_table::replication::*;
use garage_table::*; use garage_table::*;
use crate::index_counter::*; use crate::index_counter::*;
@ -188,7 +187,7 @@ impl Entry<K2VItemPartition, String> for K2VItem {
} }
pub struct K2VItemTable { pub struct K2VItemTable {
pub(crate) counter_table: Arc<IndexCounter<K2VItem, TableShardedReplication>>, pub(crate) counter_table: Arc<IndexCounter<K2VItem>>,
pub(crate) subscriptions: Arc<SubscriptionManager>, pub(crate) subscriptions: Arc<SubscriptionManager>,
} }

4
src/model/s3/object_table.rs
View file

@ -8,7 +8,7 @@ use garage_util::background::BackgroundRunner;
use garage_util::data::*; use garage_util::data::*;
use garage_table::crdt::*; use garage_table::crdt::*;
use garage_table::replication::*; use garage_table::replication::TableShardedReplication;
use garage_table::*; use garage_table::*;
use crate::index_counter::*; use crate::index_counter::*;
@ -223,7 +223,7 @@ impl Crdt for Object {
pub struct ObjectTable { pub struct ObjectTable {
pub background: Arc<BackgroundRunner>, pub background: Arc<BackgroundRunner>,
pub version_table: Arc<Table<VersionTable, TableShardedReplication>>, pub version_table: Arc<Table<VersionTable, TableShardedReplication>>,
pub object_counter_table: Arc<IndexCounter<Object, TableFullReplication>>, pub object_counter_table: Arc<IndexCounter<Object>>,
} }
#[derive(Clone, Copy, Debug, Serialize, Deserialize)] #[derive(Clone, Copy, Debug, Serialize, Deserialize)]