starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-10-08 00:02:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve deadlocks for parallel branches with parallelism constraints

Browse Source
This commit is contained in:
Ruben Fiszel
2024-04-09 11:52:40 +02:00
parent 1ab1fb7e4d
commit 0c824de4cd
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/src/worker_flow.rs
+15 -15
View File
@@ -415,29 +415,29 @@ pub async fn update_flow_status_after_job_completion_internal<
tx.commit().await?;
if parallelism.is_some() {
let mut tx = db.begin().await?;
// this ensure that the lock is taken in the same order and thus avoid deadlocks
let ids = sqlx::query_scalar!(
"SELECT id FROM queue WHERE parent_job = $1 AND suspend > 0 ORDER by suspend FOR UPDATE",
"SELECT id FROM queue WHERE parent_job = $1 AND suspend > 0 ORDER by suspend",
flow
)
.fetch_all(&mut *tx)
.fetch_all(db)
.await
.map_err(|e| {
Error::InternalErr(format!("error while locking jobs to decrease parallelism of: {e}"))
})?;
sqlx::query!(
"UPDATE queue SET suspend = suspend - 1 WHERE id = ANY($1)",
ids.as_slice()
)
.execute(&mut *tx)
.await
.map_err(|e| {
Error::InternalErr(format!("error decreasing suspend: {e}"))
})?;
tx.commit().await?;
for id in ids {
sqlx::query!(
"UPDATE queue SET suspend = suspend - 1 WHERE id = $1",
id
)
.execute(db)
.await
.map_err(|e| {
Error::InternalErr(format!(
"error decreasing suspend for {id}: {e}"
))
})?;
}
}
sqlx::query!(