aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-06-09 14:55:20 +0200
committerAlex Auvolat <alex@adnab.me>2022-06-09 14:55:20 +0200
commit138e13071be37d873344cd03e316c87ff8057ea0 (patch)
treebc74cd3bab1657ca8fec7fda01aba949a9a0897e
parentb44d3fc796484a50cd6854f20c9b46e5fddedc9d (diff)
downloadgarage-fix-build.tar.gz
garage-fix-build.zip
Fix garage_db build on 32-bit systemsfix-build
-rw-r--r--src/db/bin/convert.rs9
-rw-r--r--src/db/lmdb_adapter.rs14
-rw-r--r--src/garage/server.rs7
3 files changed, 16 insertions, 14 deletions
diff --git a/src/db/bin/convert.rs b/src/db/bin/convert.rs
index 9e45e61f..bbde2048 100644
--- a/src/db/bin/convert.rs
+++ b/src/db/bin/convert.rs
@@ -55,14 +55,7 @@ fn open_db(path: PathBuf, engine: String) -> Result<Db> {
Error(format!("Unable to create LMDB data directory: {}", e).into())
})?;
- let map_size = if u32::MAX as usize == usize::MAX {
- eprintln!(
- "LMDB is not recommended on 32-bit systems, database size will be limited"
- );
- 1usize << 30 // 1GB for 32-bit systems
- } else {
- 1usize << 40 // 1TB for 64-bit systems
- };
+ let map_size = lmdb_adapter::recommended_map_size();
let db = lmdb_adapter::heed::EnvOpenOptions::new()
.max_dbs(100)
diff --git a/src/db/lmdb_adapter.rs b/src/db/lmdb_adapter.rs
index 74622919..62fcc3e6 100644
--- a/src/db/lmdb_adapter.rs
+++ b/src/db/lmdb_adapter.rs
@@ -327,3 +327,17 @@ where
}
}
}
+
+// ----
+
+#[cfg(target_pointer_width = "64")]
+pub fn recommended_map_size() -> usize {
+ 1usize << 40
+}
+
+#[cfg(target_pointer_width = "32")]
+pub fn recommended_map_size() -> usize {
+ use log::warn;
+ warn!("LMDB is not recommended on 32-bit systems, database size will be limited");
+ 1usize << 30
+}
diff --git a/src/garage/server.rs b/src/garage/server.rs
index 697d3358..7aa6185f 100644
--- a/src/garage/server.rs
+++ b/src/garage/server.rs
@@ -57,12 +57,7 @@ pub async fn run_server(config_file: PathBuf) -> Result<(), Error> {
db_path.push("db.lmdb");
info!("Opening LMDB database at: {}", db_path.display());
std::fs::create_dir_all(&db_path).expect("Unable to create LMDB data directory");
- let map_size = if u32::MAX as usize == usize::MAX {
- warn!("LMDB is not recommended on 32-bit systems, database size will be limited");
- 1usize << 30 // 1GB for 32-bit systems
- } else {
- 1usize << 40 // 1TB for 64-bit systems
- };
+ let map_size = garage_db::lmdb_adapter::recommended_map_size();
let db = db::lmdb_adapter::heed::EnvOpenOptions::new()
.max_dbs(100)