src/garage/repair/online.rs

@@ -107,28 +107,29 @@ impl Worker for RepairVersionsWorker {
 
 		let version = Version::decode(&item_bytes).ok_or_message("Cannot decode Version")?;
 		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 {
 				info!("Repair versions: marking version as deleted: {:?}", version);
 				self.garage
 					.version_table
-					.insert(&Version::new(
+					.insert(&Version::new(version.uuid, version.backlink, true))
-						version.uuid,
-						version.bucket_id,
-						version.key,
-						true,
-					))
 					.await?;
 			}
 		}