Alex
5768bf3622
All checks were successful
continuous-integration/drone/push Build is passing
**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: #293 Co-authored-by: Alex <alex@adnab.me> Co-committed-by: Alex <alex@adnab.me>
150 lines
3.5 KiB
Rust
150 lines
3.5 KiB
Rust
use std::sync::Arc;
|
|
|
|
use tokio::sync::watch;
|
|
|
|
use garage_model::garage::Garage;
|
|
use garage_model::s3::block_ref_table::*;
|
|
use garage_model::s3::object_table::*;
|
|
use garage_model::s3::version_table::*;
|
|
use garage_table::*;
|
|
use garage_util::error::Error;
|
|
|
|
use crate::*;
|
|
|
|
pub struct Repair {
|
|
pub garage: Arc<Garage>,
|
|
}
|
|
|
|
impl Repair {
|
|
pub async fn repair_worker(&self, opt: RepairOpt, must_exit: watch::Receiver<bool>) {
|
|
if let Err(e) = self.repair_worker_aux(opt, must_exit).await {
|
|
warn!("Repair worker failed with error: {}", e);
|
|
}
|
|
}
|
|
|
|
async fn repair_worker_aux(
|
|
&self,
|
|
opt: RepairOpt,
|
|
must_exit: watch::Receiver<bool>,
|
|
) -> Result<(), Error> {
|
|
match opt.what {
|
|
RepairWhat::Tables => {
|
|
info!("Launching a full sync of tables");
|
|
self.garage.bucket_table.syncer.add_full_sync();
|
|
self.garage.object_table.syncer.add_full_sync();
|
|
self.garage.version_table.syncer.add_full_sync();
|
|
self.garage.block_ref_table.syncer.add_full_sync();
|
|
self.garage.key_table.syncer.add_full_sync();
|
|
}
|
|
RepairWhat::Versions => {
|
|
info!("Repairing the versions table");
|
|
self.repair_versions(&must_exit).await?;
|
|
}
|
|
RepairWhat::BlockRefs => {
|
|
info!("Repairing the block refs table");
|
|
self.repair_block_ref(&must_exit).await?;
|
|
}
|
|
RepairWhat::Blocks => {
|
|
info!("Repairing the stored blocks");
|
|
self.garage
|
|
.block_manager
|
|
.repair_data_store(&must_exit)
|
|
.await?;
|
|
}
|
|
RepairWhat::Scrub { tranquility } => {
|
|
info!("Verifying integrity of stored blocks");
|
|
self.garage
|
|
.block_manager
|
|
.scrub_data_store(&must_exit, tranquility)
|
|
.await?;
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
async fn repair_versions(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> {
|
|
let mut pos = vec![];
|
|
|
|
while let Some((item_key, item_bytes)) =
|
|
self.garage.version_table.data.store.get_gt(&pos)?
|
|
{
|
|
pos = item_key.to_vec();
|
|
|
|
let version = rmp_serde::decode::from_read_ref::<_, Version>(item_bytes.as_ref())?;
|
|
if version.deleted.get() {
|
|
continue;
|
|
}
|
|
let object = self
|
|
.garage
|
|
.object_table
|
|
.get(&version.bucket_id, &version.key)
|
|
.await?;
|
|
let version_exists = match object {
|
|
Some(o) => o
|
|
.versions()
|
|
.iter()
|
|
.any(|x| x.uuid == version.uuid && x.state != ObjectVersionState::Aborted),
|
|
None => false,
|
|
};
|
|
if !version_exists {
|
|
info!("Repair versions: marking version as deleted: {:?}", version);
|
|
self.garage
|
|
.version_table
|
|
.insert(&Version::new(
|
|
version.uuid,
|
|
version.bucket_id,
|
|
version.key,
|
|
true,
|
|
))
|
|
.await?;
|
|
}
|
|
|
|
if *must_exit.borrow() {
|
|
break;
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
async fn repair_block_ref(&self, must_exit: &watch::Receiver<bool>) -> Result<(), Error> {
|
|
let mut pos = vec![];
|
|
|
|
while let Some((item_key, item_bytes)) =
|
|
self.garage.block_ref_table.data.store.get_gt(&pos)?
|
|
{
|
|
pos = item_key.to_vec();
|
|
|
|
let block_ref = rmp_serde::decode::from_read_ref::<_, BlockRef>(item_bytes.as_ref())?;
|
|
if block_ref.deleted.get() {
|
|
continue;
|
|
}
|
|
let version = self
|
|
.garage
|
|
.version_table
|
|
.get(&block_ref.version, &EmptyKey)
|
|
.await?;
|
|
// The version might not exist if it has been GC'ed
|
|
let ref_exists = version.map(|v| !v.deleted.get()).unwrap_or(false);
|
|
if !ref_exists {
|
|
info!(
|
|
"Repair block ref: marking block_ref as deleted: {:?}",
|
|
block_ref
|
|
);
|
|
self.garage
|
|
.block_ref_table
|
|
.insert(&BlockRef {
|
|
block: block_ref.block,
|
|
version: block_ref.version,
|
|
deleted: true.into(),
|
|
})
|
|
.await?;
|
|
}
|
|
|
|
if *must_exit.borrow() {
|
|
break;
|
|
}
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|