Deuxfleurs/garage
48
56
Fork 73
Code Issues 100 Pull requests 13 Releases 30 Wiki Activity

Allow to set LMDB map size in convert-db script #690

Closed
rdelaage wants to merge 1 commit from rdelaage/garage:feat/set_lmdb_map_size_convert-db into main
pull from: rdelaage/garage:feat/set_lmdb_map_size_convert-db
merge into: Deuxfleurs:main
Conversation 6 Commits 1 Files changed 1 +11 -4
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/garage/cli/convert_db.rs
View file

@ -22,16 +22,20 @@ pub struct ConvertDbOpt {
/// Output database engine /// Output database engine
#[structopt(short = "b")] #[structopt(short = "b")]
output_engine: String, output_engine: String,
/// LMDB map size
#[structopt(long = "lmdb_map_size")]
lmdb_map_size: Option<usize>,
} }
pub(crate) fn do_conversion(args: ConvertDbOpt) -> Result<()> { pub(crate) fn do_conversion(args: ConvertDbOpt) -> Result<()> {
let input = open_db(args.input_path, args.input_engine)?; let input = open_db(args.input_path, args.input_engine, args.lmdb_map_size)?;
let output = open_db(args.output_path, args.output_engine)?; let output = open_db(args.output_path, args.output_engine, args.lmdb_map_size)?;
output.import(&input)?; output.import(&input)?;
Ok(()) Ok(())
} }
fn open_db(path: PathBuf, engine: String) -> Result<Db> { fn open_db(path: PathBuf, engine: String, lmdb_map_size: Option<usize>) -> Result<Db> {
match engine.as_str() { match engine.as_str() {
#[cfg(feature = "sled")] #[cfg(feature = "sled")]
"sled" => { "sled" => {
@ -51,7 +55,10 @@ fn open_db(path: PathBuf, engine: String) -> Result<Db> {
Error(format!("Unable to create LMDB data directory: {}", e).into()) Error(format!("Unable to create LMDB data directory: {}", e).into())
})?; })?;
let map_size = lmdb_adapter::recommended_map_size(); let map_size = match lmdb_map_size {
Some(map_size) => map_size,
None => lmdb_adapter::recommended_map_size(),
};
let mut env_builder = lmdb_adapter::heed::EnvOpenOptions::new(); let mut env_builder = lmdb_adapter::heed::EnvOpenOptions::new();
env_builder.max_dbs(100); env_builder.max_dbs(100);