diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-09-11 18:34:59 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-09-11 18:34:59 +0200 |
| commit | f8b3883611578713ecb8bcacaf24ca8029e7b739 (patch) | |
| tree | 8e4fa625c3c9ecdc93575ce0bb45ec301ed81227 /src/model | |
| parent | 51b9731a086b4e158cbfa2127bcbfd6cb6274578 (diff) | |
| download | garage-f8b3883611578713ecb8bcacaf24ca8029e7b739.tar.gz garage-f8b3883611578713ecb8bcacaf24ca8029e7b739.zip | |
config: make block_size and sled_cache_capacity expressable as strings
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/model/garage.rs | 16 |
2 files changed, 4 insertions, 13 deletions
diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml index caf7d1b0..1d3600a6 100644 --- a/src/model/Cargo.toml +++ b/src/model/Cargo.toml @@ -23,7 +23,6 @@ garage_util.workspace = true async-trait = "0.1.7" arc-swap = "1.0" blake2 = "0.10" -bytesize = "1.2" err-derive = "0.3" hex = "0.4" base64 = "0.21" diff --git a/src/model/garage.rs b/src/model/garage.rs index 8fea6a2c..a432aa7a 100644 --- a/src/model/garage.rs +++ b/src/model/garage.rs @@ -95,7 +95,7 @@ impl Garage { info!("Opening Sled database at: {}", db_path.display()); let db = db::sled_adapter::sled::Config::default() .path(&db_path) - .cache_capacity(config.sled_cache_capacity) + .cache_capacity(config.sled_cache_capacity as u64) .flush_every_ms(Some(config.sled_flush_every_ms)) .open() .ok_or_message("Unable to open sled DB")?; @@ -121,21 +121,13 @@ impl Garage { // ---- LMDB DB ---- #[cfg(feature = "lmdb")] "lmdb" | "heed" => { - use std::convert::TryInto; db_path.push("db.lmdb"); info!("Opening LMDB database at: {}", db_path.display()); std::fs::create_dir_all(&db_path) .ok_or_message("Unable to create LMDB data directory")?; - let map_size = match &config.lmdb_map_size { - None => garage_db::lmdb_adapter::recommended_map_size(), - Some(v) => { - let v: usize = v - .parse::<bytesize::ByteSize>() - .ok() - .and_then(|x| x.as_u64().try_into().ok()) - .ok_or_message("invalid value for `lmdb_map_size`")?; - v - (v % 4096) - } + let map_size = match config.lmdb_map_size { + v if v == usize::default() => garage_db::lmdb_adapter::recommended_map_size(), + v => v - (v % 4096), }; use db::lmdb_adapter::heed; |