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

status daemon no longer deadlocking

Browse Source
This commit is contained in:
Aiden McClelland
2021-09-20 10:53:41 -06:00
committed by Aiden McClelland
parent 2638e2878e
commit 1383567a3a
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
appmgr/src/status/mod.rs
View File

@@ -26,9 +26,20 @@ pub async fn synchronize_all(ctx: &RpcContext) -> Result<(), Error> {
.package_data() .package_data()
.keys(&mut ctx.db.handle(), false) .keys(&mut ctx.db.handle(), false)
.await?; .await?;
// TODO: parallelize this
for id in pkg_ids { for id in pkg_ids {
async fn status(ctx: &RpcContext, id: PackageId) -> Result<(), Error> { async fn status(ctx: &RpcContext, id: PackageId) -> Result<(), Error> {
let mut db = ctx.db.handle(); let mut db = ctx.db.handle();
// TODO: DRAGONS!!
// this locks all of package data to solve a deadlock issue below. As of the writing of this comment, it
// hangs during the `check` operation on /package-data/<id>. There is another daemon loop somewhere that
// is likely iterating through packages in a different order.
crate::db::DatabaseModel::new()
.package_data()
.lock(&mut db, LockType::Write)
.await;
// Without the above lock, the below check operation will deadlock
let model = crate::db::DatabaseModel::new() let model = crate::db::DatabaseModel::new()
.package_data() .package_data()
.idx_model(&id) .idx_model(&id)
@@ -40,7 +51,6 @@ pub async fn synchronize_all(ctx: &RpcContext) -> Result<(), Error> {
crate::ErrorKind::Database, crate::ErrorKind::Database,
) )
})?; })?;
model.lock(&mut db, LockType::Write).await;
let (mut status, manager) = let (mut status, manager) =
if let Some(installed) = model.installed().check(&mut db).await? { if let Some(installed) = model.installed().check(&mut db).await? {
( (