4 files changed, 36 insertions, 13 deletions
diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml
index 2efb0270..6554ac13 100644
--- a/src/util/Cargo.toml
+++ b/src/util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "garage_util"
-version = "0.8.4"
+version = "0.9.0"
 authors = ["Alex Auvolat <alex@adnab.me>"]
 edition = "2018"
 license = "AGPL-3.0"
@@ -32,7 +32,7 @@ rand = "0.8"
 sha2 = "0.10"
 
 chrono = "0.4"
-rmp-serde = "0.15"
+rmp-serde = "1.1.2"
 serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
 serde_json = "1.0"
 toml = "0.6"
@@ -40,7 +40,7 @@ toml = "0.6"
 futures = "0.3"
 tokio = { version = "1.0", default-features = false, features = ["rt", "rt-multi-thread", "io-util", "net", "time", "macros", "sync", "signal", "fs"] }
 
-netapp = "0.5"
+netapp = "0.10"
 
 http = "0.2"
 hyper = "0.14"
diff --git a/src/util/config.rs b/src/util/config.rs
index ebcb5fbe..ad5c8e1f 100644
--- a/src/util/config.rs
+++ b/src/util/config.rs
@@ -15,7 +15,14 @@ pub struct Config {
 	/// Path where to store metadata. Should be fast, but low volume
 	pub metadata_dir: PathBuf,
 	/// Path where to store data. Can be slower, but need higher volume
-	pub data_dir: PathBuf,
+	pub data_dir: DataDirEnum,
+
+	/// Whether to fsync after all metadata transactions (disabled by default)
+	#[serde(default)]
+	pub metadata_fsync: bool,
+	/// Whether to fsync after all data block writes (disabled by default)
+	#[serde(default)]
+	pub data_fsync: bool,
 
 	/// Size of data blocks to save to disk
 	#[serde(
@@ -99,6 +106,26 @@ pub struct Config {
 	pub admin: AdminConfig,
 }
 
+/// Value for data_dir: either a single directory or a list of dirs with attributes
+#[derive(Deserialize, Debug, Clone)]
+#[serde(untagged)]
+pub enum DataDirEnum {
+	Single(PathBuf),
+	Multiple(Vec<DataDir>),
+}
+
+#[derive(Deserialize, Debug, Clone)]
+pub struct DataDir {
+	/// Path to the data directory
+	pub path: PathBuf,
+	/// Capacity of the drive (required if read_only is false)
+	#[serde(default)]
+	pub capacity: Option<String>,
+	/// Whether this is a legacy read-only path (capacity should be None)
+	#[serde(default)]
+	pub read_only: bool,
+}
+
 /// Configuration for S3 api
 #[derive(Deserialize, Debug, Clone)]
 pub struct S3ApiConfig {
@@ -195,7 +222,7 @@ pub struct KubernetesDiscoveryConfig {
 }
 
 fn default_db_engine() -> String {
-	"sled".into()
+	"lmdb".into()
 }
 
 fn default_sled_cache_capacity() -> usize {
diff --git a/src/util/encode.rs b/src/util/encode.rs
index 1cd3198f..a9ab9a35 100644
--- a/src/util/encode.rs
+++ b/src/util/encode.rs
@@ -8,9 +8,7 @@ where
 	T: Serialize + ?Sized,
 {
 	let mut wr = Vec::with_capacity(128);
-	let mut se = rmp_serde::Serializer::new(&mut wr)
-		.with_struct_map()
-		.with_string_variants();
+	let mut se = rmp_serde::Serializer::new(&mut wr).with_struct_map();
 	val.serialize(&mut se)?;
 	Ok(wr)
 }
@@ -22,7 +20,7 @@ pub fn nonversioned_decode<T>(bytes: &[u8]) -> Result<T, rmp_serde::decode::Erro
 where
 	T: for<'de> Deserialize<'de> + ?Sized,
 {
-	rmp_serde::decode::from_read_ref::<_, T>(bytes)
+	rmp_serde::decode::from_slice::<_>(bytes)
 }
 
 /// Serialize to JSON, truncating long result
diff --git a/src/util/migrate.rs b/src/util/migrate.rs
index b9cce08a..45147c74 100644
--- a/src/util/migrate.rs
+++ b/src/util/migrate.rs
@@ -19,7 +19,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static {
 	fn decode(bytes: &[u8]) -> Option<Self> {
 		let marker_len = Self::VERSION_MARKER.len();
 		if bytes.get(..marker_len) == Some(Self::VERSION_MARKER) {
-			if let Ok(value) = rmp_serde::decode::from_read_ref::<_, Self>(&bytes[marker_len..]) {
+			if let Ok(value) = rmp_serde::decode::from_slice::<_>(&bytes[marker_len..]) {
 				return Some(value);
 			}
 		}
@@ -31,9 +31,7 @@ pub trait Migrate: Serialize + for<'de> Deserialize<'de> + 'static {
 	fn encode(&self) -> Result<Vec<u8>, rmp_serde::encode::Error> {
 		let mut wr = Vec::with_capacity(128);
 		wr.extend_from_slice(Self::VERSION_MARKER);
-		let mut se = rmp_serde::Serializer::new(&mut wr)
-			.with_struct_map()
-			.with_string_variants();
+		let mut se = rmp_serde::Serializer::new(&mut wr).with_struct_map();
 		self.serialize(&mut se)?;
 		Ok(wr)
 	}