diff options
| author | Alex Auvolat <alex@adnab.me> | 2023-09-11 20:00:02 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2023-09-11 20:00:02 +0200 |
| commit | 51abbb02d8b77529c2e3db079d527d0f28c737bc (patch) | |
| tree | 5dbc1611f968214ba103c73cd0cf2cc966696eef /src/model | |
| parent | ad6b1cc0bed8a01ebeb2aacf995a69ced785b5a6 (diff) | |
| parent | 2548a247f22a6404a2f447e9f9c47fe18e10f67a (diff) | |
| download | garage-51abbb02d8b77529c2e3db079d527d0f28c737bc.tar.gz garage-51abbb02d8b77529c2e3db079d527d0f28c737bc.zip | |
Merge branch 'main' into next
Diffstat (limited to 'src/model')
| -rw-r--r-- | src/model/garage.rs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/model/garage.rs b/src/model/garage.rs index 721d5e3a..8c9a3af3 100644 --- a/src/model/garage.rs +++ b/src/model/garage.rs @@ -124,7 +124,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")?; @@ -163,7 +163,10 @@ impl Garage { 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 = garage_db::lmdb_adapter::recommended_map_size(); + 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; let mut env_builder = heed::EnvOpenOptions::new(); @@ -182,6 +185,7 @@ impl Garage { "OutOfMemory error while trying to open LMDB database. This can happen \ if your operating system is not allowing you to use sufficient virtual \ memory address space. Please check that no limit is set (ulimit -v). \ + You may also try to set a smaller `lmdb_map_size` configuration parameter. \ On 32-bit machines, you should probably switch to another database engine.".into())) } x => x.ok_or_message("Unable to open LMDB DB")?, |