More security: don't delete stuff too easily

3 files changed, 12 insertions, 1 deletions

diff --git a/src/model/block.rs b/src/model/block.rs
index 987ec9e4..a3bbe43d 100644
--- a/src/model/block.rs
+++ b/src/model/block.rs
@@ -305,6 +305,9 @@ impl BlockManager {
 			let ring = self.system.ring.borrow().clone();
 
 			let mut who = self.replication.replication_nodes(&hash, &ring);
+			if who.len() < self.replication.write_quorum(&self.system) {
+				return Err(Error::Message(format!("Not trying to offload block because we don't have a quorum of nodes to write to")));
+			}
 			who.retain(|id| *id != self.system.id);
 
 			let msg = Arc::new(Message::NeedBlockQuery(*hash));
diff --git a/src/table/replication/fullcopy.rs b/src/table/replication/fullcopy.rs
index a20f20b7..a5faece9 100644
--- a/src/table/replication/fullcopy.rs
+++ b/src/table/replication/fullcopy.rs
@@ -41,7 +41,12 @@ impl TableReplication for TableFullReplication {
 		self.replication_nodes(hash, system.ring.borrow().as_ref())
 	}
 	fn write_quorum(&self, system: &System) -> usize {
-		system.ring.borrow().config.members.len() - self.max_faults
+		let nmembers = system.ring.borrow().config.members.len();
+		if nmembers > self.max_faults {
+			nmembers - self.max_faults
+		} else {
+			1
+		}
 	}
 	fn max_write_errors(&self) -> usize {
 		self.max_faults
diff --git a/src/table/sync.rs b/src/table/sync.rs
index b5044a4e..f8ebb2f0 100644
--- a/src/table/sync.rs
+++ b/src/table/sync.rs
@@ -277,6 +277,9 @@ where
 					warn!("Interrupting offload as partitions seem to have changed");
 					break;
 				}
+				if nodes.len() < self.aux.replication.write_quorum(&self.aux.system) {
+					return Err(Error::Message(format!("Not offloading as we don't have a quorum of nodes to write to.")));
+				}
 
 				counter += 1;
 				debug!(