From 0a283e4e70bbced6e1087df10e661a5a3d33289e Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Sun, 26 Apr 2020 18:59:17 +0000
Subject: [PATCH] Fix deletion propagation

---
 src/core/object_table.rs | 10 ++++++++--
 src/garage/repair.rs     |  6 +++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/core/object_table.rs b/src/core/object_table.rs
index 98e8d636..04f64fe7 100644
--- a/src/core/object_table.rs
+++ b/src/core/object_table.rs
@@ -163,11 +163,17 @@ impl TableSchema for ObjectTable {
 		if let (Some(old_v), Some(new_v)) = (old, new) {
 			// Propagate deletion of old versions
 			for v in old_v.versions.iter() {
-				if new_v
+				let newly_deleted = match new_v
 					.versions
 					.binary_search_by(|nv| nv.cmp_key().cmp(&v.cmp_key()))
-					.is_err()
 				{
+					Err(_) => true,
+					Ok(i) => {
+						new_v.versions[i].state == ObjectVersionState::Aborted
+							&& v.state != ObjectVersionState::Aborted
+					}
+				};
+				if newly_deleted {
 					let deleted_version = Version::new(
 						v.uuid,
 						old_v.bucket.clone(),
diff --git a/src/garage/repair.rs b/src/garage/repair.rs
index e91b4159..f2ca64ae 100644
--- a/src/garage/repair.rs
+++ b/src/garage/repair.rs
@@ -4,6 +4,7 @@ use tokio::sync::watch;
 
 use garage_core::block_ref_table::*;
 use garage_core::garage::Garage;
+use garage_core::object_table::*;
 use garage_core::version_table::*;
 use garage_table::*;
 use garage_util::error::Error;
@@ -105,7 +106,10 @@ impl Repair {
 				.get(&version.bucket, &version.key)
 				.await?;
 			let version_exists = match object {
-				Some(o) => o.versions().iter().any(|x| x.uuid == version.uuid),
+				Some(o) => o
+					.versions()
+					.iter()
+					.any(|x| x.uuid == version.uuid && x.state != ObjectVersionState::Aborted),
 				None => {
 					warn!(
 						"Repair versions: object for version {:?} not found",