Deuxfleurs/garage
48
55
Fork 73
Code Issues 100 Pull requests 15 Releases 30 Wiki Activity

Garage v0.9 #473

Merged
lx merged 175 commits from next into main 2023-10-10 13:28:29 +00:00
Conversation 0 Commits 175 Files changed 120 +18 -17
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 75a0e01372 - Show all commits

35
src/garage/repair/online.rs
View file

@ -107,28 +107,29 @@ impl Worker for RepairVersionsWorker {
let version = Version::decode(&item_bytes).ok_or_message("Cannot decode Version")?; let version = Version::decode(&item_bytes).ok_or_message("Cannot decode Version")?;
if !version.deleted.get() { if !version.deleted.get() {
let object = self let version_exists = match &version.backlink {
.garage VersionBacklink::Object { bucket_id, key } => {
.object_table let object = self.garage.object_table.get(&bucket_id, &key).await?;
.get(&version.bucket_id, &version.key) match object {
.await?; Some(o) => o.versions().iter().any(|x| {
let version_exists = match object { x.uuid == version.uuid && x.state != ObjectVersionState::Aborted
Some(o) => o }),
.versions() None => false,
.iter() }
.any(|x| x.uuid == version.uuid && x.state != ObjectVersionState::Aborted), }
None => false, VersionBacklink::MultipartUpload { upload_id } => {
let mpu = self.garage.mpu_table.get(&upload_id, &EmptyKey).await?;
match mpu {
Some(u) => !u.deleted.get(),
None => false,
}
}
}; };
if !version_exists { if !version_exists {
info!("Repair versions: marking version as deleted: {:?}", version); info!("Repair versions: marking version as deleted: {:?}", version);
self.garage self.garage
.version_table .version_table
.insert(&Version::new( .insert(&Version::new(version.uuid, version.backlink, true))
version.uuid,
version.bucket_id,
version.key,
true,
))
.await?; .await?;
} }
} }