Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter package ids when backing up (#1589)

Browse Source
This commit is contained in:
Aiden McClelland
2022-06-30 11:23:01 -06:00
committed by GitHub
parent 8966b62ec7
commit 7d7f03da4f
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/backup/backup_bulk.rs
View File

@@ -131,7 +131,7 @@ pub async fn backup_all(
long = "package-ids", long = "package-ids",
parse(parse_comma_separated) parse(parse_comma_separated)
)] )]
service_ids: Option<BTreeSet<PackageId>>, package_ids: Option<BTreeSet<PackageId>>,
#[arg] password: String, #[arg] password: String,
) -> Result<WithRevision<()>, Error> { ) -> Result<WithRevision<()>, Error> {
let mut db = ctx.db.handle(); let mut db = ctx.db.handle();
@@ -153,13 +153,13 @@ pub async fn backup_all(
.into_iter() .into_iter()
.cloned() .cloned()
.collect(); .collect();
let service_ids = service_ids.unwrap_or(all_packages); let package_ids = package_ids.unwrap_or(all_packages);
if old_password.is_some() { if old_password.is_some() {
backup_guard.change_password(&password)?; backup_guard.change_password(&password)?;
} }
let revision = assure_backing_up(&mut db, &service_ids).await?; let revision = assure_backing_up(&mut db, &package_ids).await?;
tokio::task::spawn(async move { tokio::task::spawn(async move {
let backup_res = perform_backup(&ctx, &mut db, backup_guard).await; let backup_res = perform_backup(&ctx, &mut db, backup_guard, &package_ids).await;
let backup_progress = crate::db::DatabaseModel::new() let backup_progress = crate::db::DatabaseModel::new()
.server_info() .server_info()
.status_info() .status_info()
@@ -285,6 +285,7 @@ async fn perform_backup<Db: DbHandle>(
ctx: &RpcContext, ctx: &RpcContext,
mut db: Db, mut db: Db,
mut backup_guard: BackupMountGuard<TmpMountGuard>, mut backup_guard: BackupMountGuard<TmpMountGuard>,
package_ids: &BTreeSet<PackageId>,
) -> Result<BTreeMap<PackageId, PackageBackupReport>, Error> { ) -> Result<BTreeMap<PackageId, PackageBackupReport>, Error> {
let mut backup_report = BTreeMap::new(); let mut backup_report = BTreeMap::new();
@@ -292,6 +293,8 @@ async fn perform_backup<Db: DbHandle>(
.package_data() .package_data()
.keys(&mut db, false) .keys(&mut db, false)
.await? .await?
.into_iter()
.filter(|id| package_ids.contains(id))
{ {
let mut tx = db.begin().await?; // for lock scope let mut tx = db.begin().await?; // for lock scope
let installed_model = if let Some(installed_model) = crate::db::DatabaseModel::new() let installed_model = if let Some(installed_model) = crate::db::DatabaseModel::new()