From 45bdf54e7eef26dbf6844e6ff9f25458a24f71cd Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Sun, 4 May 2025 16:43:36 +0200
Subject: [PATCH] throw error on legacy replication_mode setting

---
 script/dev-cluster.sh       |  8 +++++++-
 src/rpc/replication_mode.rs | 36 ++++++++++++++----------------------
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/script/dev-cluster.sh b/script/dev-cluster.sh
index 60991a66..81a37099 100755
--- a/script/dev-cluster.sh
+++ b/script/dev-cluster.sh
@@ -30,6 +30,12 @@ for count in $(seq 1 3); do
 CONF_PATH="/tmp/config.$count.toml"
 LABEL="\e[${FANCYCOLORS[$count]}[$count]\e[49m"
 
+if [ "$GARAGE_OLDVER" == "v08" ]; then
+	REPLICATION_MODE="replication_mode = \"3\""
+else
+	REPLICATION_MODE="replication_factor = 3"
+fi
+
 cat > $CONF_PATH <<EOF
 block_size = 1048576			# objects are split in blocks of maximum this number of bytes
 metadata_dir = "/tmp/garage-meta-$count"
@@ -38,7 +44,7 @@ data_dir = "/tmp/garage-data-$count"
 rpc_bind_addr = "0.0.0.0:$((3900+$count))"		# the port other Garage nodes will use to talk to this node
 rpc_public_addr = "127.0.0.1:$((3900+$count))"
 bootstrap_peers = []
-replication_factor = 3
+$REPLICATION_MODE
 rpc_secret = "$NETWORK_SECRET"
 
 [s3_api]
diff --git a/src/rpc/replication_mode.rs b/src/rpc/replication_mode.rs
index caf67462..7bb91978 100644
--- a/src/rpc/replication_mode.rs
+++ b/src/rpc/replication_mode.rs
@@ -71,26 +71,18 @@ pub fn parse_replication_mode(
 	config: &Config,
 ) -> Result<(ReplicationFactor, ConsistencyMode), Error> {
 	match (&config.replication_mode, config.replication_factor, config.consistency_mode.as_str()) {
-        (Some(replication_mode), None, "consistent") => {
-            tracing::warn!("Legacy config option replication_mode in use. Please migrate to replication_factor and consistency_mode");
-            let parsed_replication_mode = match replication_mode.as_str() {
-                "1" | "none"  => Some((ReplicationFactor(1), ConsistencyMode::Consistent)),
-                "2"           => Some((ReplicationFactor(2), ConsistencyMode::Consistent)),
-                "2-dangerous" => Some((ReplicationFactor(2), ConsistencyMode::Dangerous)),
-                "3"           => Some((ReplicationFactor(3), ConsistencyMode::Consistent)),
-                "3-degraded"  => Some((ReplicationFactor(3), ConsistencyMode::Degraded)),
-                "3-dangerous" => Some((ReplicationFactor(3), ConsistencyMode::Dangerous)),
-                _ => None,
-            };
-            Some(parsed_replication_mode.ok_or_message("Invalid replication_mode in config file.")?)
-        },
-        (None, Some(replication_factor), consistency_mode) => {
-            let replication_factor = ReplicationFactor::new(replication_factor)
-                .ok_or_message("Invalid replication_factor in config file.")?;
-            let consistency_mode = ConsistencyMode::parse(consistency_mode)
-                .ok_or_message("Invalid consistency_mode in config file.")?;
-            Some((replication_factor, consistency_mode))
-        }
-        _ => None,
-    }.ok_or_message("Either the legacy replication_mode or replication_level and consistency_mode can be set, not both.")
+		(Some(_replication_mode), _, _) => {
+			Err(Error::Message("The legacy replication_mode is no longer supported. Use replication_factor and consistency_mode instead.".into()))
+		}
+		(None, Some(replication_factor), consistency_mode) => {
+			let replication_factor = ReplicationFactor::new(replication_factor)
+				.ok_or_message("Invalid replication_factor in config file.")?;
+			let consistency_mode = ConsistencyMode::parse(consistency_mode)
+				.ok_or_message("Invalid consistency_mode in config file.")?;
+			Ok((replication_factor, consistency_mode))
+		}
+		(None, None, _) => {
+			Err(Error::Message("The option replication_factor is required.".into()))
+		}
+	}
 }