From b490ebc7f6058719bd22c86fd0db95b09dc027d6 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 28 May 2021 12:36:22 +0200
Subject: Many improvements on ring/replication and its configuration:

- Explicit "replication_mode" configuration parameters that takes
  either "none", "2" or "3" as values, instead of letting user configure
  replication factor themselves. These are presets whose corresponding
  replication/quorum values can be found in replication/mode.rs

- Explicit support for single-node and two-node deployments
  (number of nodes must be at least "replication_mode", with "none"
  we can have only one node)

- Ring is now stored much more compactly with 256*8 + n*32 bytes,
  instead of 256*32 bytes

- Support for gateway-only nodes that do not store data
  (these nodes still need a metadata_directory to store the list
  of bucket and keys since those are stored on all nodes; it also
  technically needs a data_directory to start but it will stay
  empty unless we have bugs)
---
 src/table/replication/mod.rs     |  2 ++
 src/table/replication/mode.rs    | 47 ++++++++++++++++++++++++++++++++++++++++
 src/table/replication/sharded.rs |  6 ++---
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 src/table/replication/mode.rs

(limited to 'src/table')

diff --git a/src/table/replication/mod.rs b/src/table/replication/mod.rs
index dfcb026a..19e6772f 100644
--- a/src/table/replication/mod.rs
+++ b/src/table/replication/mod.rs
@@ -1,8 +1,10 @@
 mod parameters;
 
 mod fullcopy;
+mod mode;
 mod sharded;
 
 pub use fullcopy::TableFullReplication;
+pub use mode::ReplicationMode;
 pub use parameters::*;
 pub use sharded::TableShardedReplication;
diff --git a/src/table/replication/mode.rs b/src/table/replication/mode.rs
new file mode 100644
index 00000000..32687288
--- /dev/null
+++ b/src/table/replication/mode.rs
@@ -0,0 +1,47 @@
+pub enum ReplicationMode {
+	None,
+	TwoWay,
+	ThreeWay,
+}
+
+impl ReplicationMode {
+	pub fn parse(v: &str) -> Option<Self> {
+		match v {
+			"none" | "1" => Some(Self::None),
+			"2" => Some(Self::TwoWay),
+			"3" => Some(Self::ThreeWay),
+			_ => None,
+		}
+	}
+
+	pub fn control_write_max_faults(&self) -> usize {
+		match self {
+			Self::None => 0,
+			_ => 1,
+		}
+	}
+
+	pub fn replication_factor(&self) -> usize {
+		match self {
+			Self::None => 1,
+			Self::TwoWay => 2,
+			Self::ThreeWay => 3,
+		}
+	}
+
+	pub fn read_quorum(&self) -> usize {
+		match self {
+			Self::None => 1,
+			Self::TwoWay => 1,
+			Self::ThreeWay => 2,
+		}
+	}
+
+	pub fn write_quorum(&self) -> usize {
+		match self {
+			Self::None => 1,
+			Self::TwoWay => 2,
+			Self::ThreeWay => 2,
+		}
+	}
+}
diff --git a/src/table/replication/sharded.rs b/src/table/replication/sharded.rs
index 93b95a38..8081b892 100644
--- a/src/table/replication/sharded.rs
+++ b/src/table/replication/sharded.rs
@@ -26,8 +26,8 @@ pub struct TableShardedReplication {
 
 impl TableReplication for TableShardedReplication {
 	fn read_nodes(&self, hash: &Hash) -> Vec<Uuid> {
-		let ring = self.system.ring.borrow().clone();
-		ring.walk_ring(&hash, self.replication_factor)
+		let ring = self.system.ring.borrow();
+		ring.get_nodes(&hash, self.replication_factor)
 	}
 	fn read_quorum(&self) -> usize {
 		self.read_quorum
@@ -35,7 +35,7 @@ impl TableReplication for TableShardedReplication {
 
 	fn write_nodes(&self, hash: &Hash) -> Vec<Uuid> {
 		let ring = self.system.ring.borrow();
-		ring.walk_ring(&hash, self.replication_factor)
+		ring.get_nodes(&hash, self.replication_factor)
 	}
 	fn write_quorum(&self) -> usize {
 		self.write_quorum
-- 
cgit v1.2.3