forked from Deuxfleurs/garage
Alex
5768bf3622
**Specification:** View spec at [this URL](https://git.deuxfleurs.fr/Deuxfleurs/garage/src/branch/k2v/doc/drafts/k2v-spec.md) - [x] Specify the structure of K2V triples - [x] Specify the DVVS format used for causality detection - [x] Specify the K2V index (just a counter of number of values per partition key) - [x] Specify single-item endpoints: ReadItem, InsertItem, DeleteItem - [x] Specify index endpoint: ReadIndex - [x] Specify multi-item endpoints: InsertBatch, ReadBatch, DeleteBatch - [x] Move to JSON objects instead of tuples - [x] Specify endpoints for polling for updates on single values (PollItem) **Implementation:** - [x] Table for K2V items, causal contexts - [x] Indexing mechanism and table for K2V index - [x] Make API handlers a bit more generic - [x] K2V API endpoint - [x] K2V API router - [x] ReadItem - [x] InsertItem - [x] DeleteItem - [x] PollItem - [x] ReadIndex - [x] InsertBatch - [x] ReadBatch - [x] DeleteBatch **Testing:** - [x] Just a simple Python script that does some requests to check visually that things are going right (does not contain parsing of results or assertions on returned values) - [x] Actual tests: - [x] Adapt testing framework - [x] Simple test with InsertItem + ReadItem - [x] Test with several Insert/Read/DeleteItem + ReadIndex - [x] Test all combinations of return formats for ReadItem - [x] Test with ReadBatch, InsertBatch, DeleteBatch - [x] Test with PollItem - [x] Test error codes - [ ] Fix most broken stuff - [x] test PollItem broken randomly - [x] when invalid causality tokens are given, errors should be 4xx not 5xx **Improvements:** - [x] Descending range queries - [x] Specify - [x] Implement - [x] Add test - [x] Batch updates to index counter - [x] Put K2V behind `k2v` feature flag Co-authored-by: Alex Auvolat <alex@adnab.me> Reviewed-on: Deuxfleurs/garage#293 Co-authored-by: Alex <alex@adnab.me> Co-committed-by: Alex <alex@adnab.me>
221 lines
5.8 KiB
Rust
221 lines
5.8 KiB
Rust
use std::sync::Arc;
|
|
|
|
use netapp::NetworkKey;
|
|
|
|
use garage_util::background::*;
|
|
use garage_util::config::*;
|
|
|
|
use garage_rpc::system::System;
|
|
|
|
use garage_block::manager::*;
|
|
use garage_table::replication::ReplicationMode;
|
|
use garage_table::replication::TableFullReplication;
|
|
use garage_table::replication::TableShardedReplication;
|
|
use garage_table::*;
|
|
|
|
use crate::s3::block_ref_table::*;
|
|
use crate::s3::object_table::*;
|
|
use crate::s3::version_table::*;
|
|
|
|
use crate::bucket_alias_table::*;
|
|
use crate::bucket_table::*;
|
|
use crate::helper;
|
|
use crate::key_table::*;
|
|
|
|
#[cfg(feature = "k2v")]
|
|
use crate::index_counter::*;
|
|
#[cfg(feature = "k2v")]
|
|
use crate::k2v::{counter_table::*, item_table::*, poll::*, rpc::*};
|
|
|
|
/// An entire Garage full of data
|
|
pub struct Garage {
|
|
/// The parsed configuration Garage is running
|
|
pub config: Config,
|
|
|
|
/// The local database
|
|
pub db: sled::Db,
|
|
/// A background job runner
|
|
pub background: Arc<BackgroundRunner>,
|
|
/// The membership manager
|
|
pub system: Arc<System>,
|
|
/// The block manager
|
|
pub block_manager: Arc<BlockManager>,
|
|
|
|
/// Table containing buckets
|
|
pub bucket_table: Arc<Table<BucketTable, TableFullReplication>>,
|
|
/// Table containing bucket aliases
|
|
pub bucket_alias_table: Arc<Table<BucketAliasTable, TableFullReplication>>,
|
|
/// Table containing api keys
|
|
pub key_table: Arc<Table<KeyTable, TableFullReplication>>,
|
|
|
|
/// Table containing S3 objects
|
|
pub object_table: Arc<Table<ObjectTable, TableShardedReplication>>,
|
|
/// Table containing S3 object versions
|
|
pub version_table: Arc<Table<VersionTable, TableShardedReplication>>,
|
|
/// Table containing S3 block references (not blocks themselves)
|
|
pub block_ref_table: Arc<Table<BlockRefTable, TableShardedReplication>>,
|
|
|
|
#[cfg(feature = "k2v")]
|
|
pub k2v: GarageK2V,
|
|
}
|
|
|
|
#[cfg(feature = "k2v")]
|
|
pub struct GarageK2V {
|
|
/// Table containing K2V items
|
|
pub item_table: Arc<Table<K2VItemTable, TableShardedReplication>>,
|
|
/// Indexing table containing K2V item counters
|
|
pub counter_table: Arc<IndexCounter<K2VCounterTable>>,
|
|
/// K2V RPC handler
|
|
pub rpc: Arc<K2VRpcHandler>,
|
|
}
|
|
|
|
impl Garage {
|
|
/// Create and run garage
|
|
pub fn new(config: Config, db: sled::Db, background: Arc<BackgroundRunner>) -> Arc<Self> {
|
|
let network_key = NetworkKey::from_slice(
|
|
&hex::decode(&config.rpc_secret).expect("Invalid RPC secret key")[..],
|
|
)
|
|
.expect("Invalid RPC secret key");
|
|
|
|
let replication_mode = ReplicationMode::parse(&config.replication_mode)
|
|
.expect("Invalid replication_mode in config file.");
|
|
|
|
info!("Initialize membership management system...");
|
|
let system = System::new(
|
|
network_key,
|
|
background.clone(),
|
|
replication_mode.replication_factor(),
|
|
&config,
|
|
);
|
|
|
|
let data_rep_param = TableShardedReplication {
|
|
system: system.clone(),
|
|
replication_factor: replication_mode.replication_factor(),
|
|
write_quorum: replication_mode.write_quorum(),
|
|
read_quorum: 1,
|
|
};
|
|
|
|
let meta_rep_param = TableShardedReplication {
|
|
system: system.clone(),
|
|
replication_factor: replication_mode.replication_factor(),
|
|
write_quorum: replication_mode.write_quorum(),
|
|
read_quorum: replication_mode.read_quorum(),
|
|
};
|
|
|
|
let control_rep_param = TableFullReplication {
|
|
system: system.clone(),
|
|
max_faults: replication_mode.control_write_max_faults(),
|
|
};
|
|
|
|
info!("Initialize block manager...");
|
|
let block_manager = BlockManager::new(
|
|
&db,
|
|
config.data_dir.clone(),
|
|
config.compression_level,
|
|
config.block_manager_background_tranquility,
|
|
data_rep_param,
|
|
system.clone(),
|
|
);
|
|
|
|
// ---- admin tables ----
|
|
info!("Initialize bucket_table...");
|
|
let bucket_table = Table::new(BucketTable, control_rep_param.clone(), system.clone(), &db);
|
|
|
|
info!("Initialize bucket_alias_table...");
|
|
let bucket_alias_table = Table::new(
|
|
BucketAliasTable,
|
|
control_rep_param.clone(),
|
|
system.clone(),
|
|
&db,
|
|
);
|
|
info!("Initialize key_table_table...");
|
|
let key_table = Table::new(KeyTable, control_rep_param, system.clone(), &db);
|
|
|
|
// ---- S3 tables ----
|
|
info!("Initialize block_ref_table...");
|
|
let block_ref_table = Table::new(
|
|
BlockRefTable {
|
|
block_manager: block_manager.clone(),
|
|
},
|
|
meta_rep_param.clone(),
|
|
system.clone(),
|
|
&db,
|
|
);
|
|
|
|
info!("Initialize version_table...");
|
|
let version_table = Table::new(
|
|
VersionTable {
|
|
background: background.clone(),
|
|
block_ref_table: block_ref_table.clone(),
|
|
},
|
|
meta_rep_param.clone(),
|
|
system.clone(),
|
|
&db,
|
|
);
|
|
|
|
info!("Initialize object_table...");
|
|
#[allow(clippy::redundant_clone)]
|
|
let object_table = Table::new(
|
|
ObjectTable {
|
|
background: background.clone(),
|
|
version_table: version_table.clone(),
|
|
},
|
|
meta_rep_param.clone(),
|
|
system.clone(),
|
|
&db,
|
|
);
|
|
|
|
// ---- K2V ----
|
|
#[cfg(feature = "k2v")]
|
|
let k2v = GarageK2V::new(system.clone(), &db, meta_rep_param);
|
|
|
|
info!("Initialize Garage...");
|
|
|
|
Arc::new(Self {
|
|
config,
|
|
db,
|
|
background,
|
|
system,
|
|
block_manager,
|
|
bucket_table,
|
|
bucket_alias_table,
|
|
key_table,
|
|
object_table,
|
|
version_table,
|
|
block_ref_table,
|
|
#[cfg(feature = "k2v")]
|
|
k2v,
|
|
})
|
|
}
|
|
|
|
pub fn bucket_helper(&self) -> helper::bucket::BucketHelper {
|
|
helper::bucket::BucketHelper(self)
|
|
}
|
|
}
|
|
|
|
#[cfg(feature = "k2v")]
|
|
impl GarageK2V {
|
|
fn new(system: Arc<System>, db: &sled::Db, meta_rep_param: TableShardedReplication) -> Self {
|
|
info!("Initialize K2V counter table...");
|
|
let counter_table = IndexCounter::new(system.clone(), meta_rep_param.clone(), db);
|
|
info!("Initialize K2V subscription manager...");
|
|
let subscriptions = Arc::new(SubscriptionManager::new());
|
|
info!("Initialize K2V item table...");
|
|
let item_table = Table::new(
|
|
K2VItemTable {
|
|
counter_table: counter_table.clone(),
|
|
subscriptions: subscriptions.clone(),
|
|
},
|
|
meta_rep_param,
|
|
system.clone(),
|
|
db,
|
|
);
|
|
let rpc = K2VRpcHandler::new(system, item_table.clone(), subscriptions);
|
|
|
|
Self {
|
|
item_table,
|
|
counter_table,
|
|
rpc,
|
|
}
|
|
}
|
|
}
|