Deuxfleurs/garage
32
59
Fork 80
Code Issues 100 Pull requests 17 Releases 30 Wiki Activity

snapshot: sqlite: use a subdirectory for consistency with LMDB #932

Merged
lx merged 1 commit from baptiste/garage:snapshot_consistency_sqlite into main 2025-01-27 18:50:11 +00:00
Conversation 1 Commits 1 Files changed 1 +4 -1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/db/sqlite_adapter.rs
View file

@ -144,9 +144,12 @@ impl IDb for SqliteDb {
let percent = (p.pagecount - p.remaining) * 100 / p.pagecount; let percent = (p.pagecount - p.remaining) * 100 / p.pagecount;
info!("Sqlite snapshot progress: {}%", percent); info!("Sqlite snapshot progress: {}%", percent);
} }
std::fs::create_dir_all(to)?;
let mut path = to.clone();
path.push("db.sqlite");
baptiste marked this conversation as resolved Outdated
lx commented 2025-01-27 17:51:49 +00:00
Outdated
Review
Copy link

I think we should call this file db.sqlite, which is the same name as the sqlite database file in the metadata directory. This makes it clear which file to replace when trying to restore a snapshot.

I think we should call this file `db.sqlite`, which is the same name as the sqlite database file in the metadata directory. This makes it clear which file to replace when trying to restore a snapshot.
baptiste commented 2025-01-27 18:08:27 +00:00
Outdated
Review
Copy link

Good catch, thanks, updated!

Good catch, thanks, updated!
self.db self.db
.get()? .get()?
.backup(rusqlite::DatabaseName::Main, to, Some(progress))?; .backup(rusqlite::DatabaseName::Main, path, Some(progress))?;
Ok(()) Ok(())
} }