From 08bcd5195654ae073afe31c341f0ce4b36094da0 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 16 Mar 2021 16:51:15 +0100
Subject: GC object table in a specific case

---
 src/model/block.rs        | 2 +-
 src/model/object_table.rs | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/model/block.rs b/src/model/block.rs
index 41729685..0d9af38f 100644
--- a/src/model/block.rs
+++ b/src/model/block.rs
@@ -259,7 +259,7 @@ impl BlockManager {
 			if let Err(e) = self.resync_iter(&mut must_exit).await {
 				warn!("Error in block resync loop: {}", e);
 				select! {
-					_ = tokio::time::sleep(Duration::from_secs(10)).fuse() => (),
+					_ = tokio::time::sleep(Duration::from_secs(1)).fuse() => (),
 					_ = must_exit.changed().fuse() => (),
 				}
 			}
diff --git a/src/model/object_table.rs b/src/model/object_table.rs
index 99fad3ce..62606df4 100644
--- a/src/model/object_table.rs
+++ b/src/model/object_table.rs
@@ -146,6 +146,9 @@ impl Entry<String, String> for Object {
 	fn sort_key(&self) -> &String {
 		&self.key
 	}
+	fn is_tombstone(&self) -> bool {
+		self.versions.len() == 1 && self.versions[0].state == ObjectVersionState::Complete(ObjectVersionData::DeleteMarker)
+	}
 }
 
 impl CRDT for Object {
-- 
cgit v1.2.3