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

respect query timeout for pg queries

Browse Source
This commit is contained in:
Ruben Fiszel
2024-02-19 20:11:28 +01:00
parent 52b2b5048d
commit fa9d5af10e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/windmill-worker/src/bigquery_executor.rs
+1 -1
View File
@@ -130,7 +130,7 @@ pub async fn do_bigquery(
}
let timeout_ms = i32::try_from(
resolve_job_timeout(&db, &job.workspace_id, job.id, None)
resolve_job_timeout(&db, &job.workspace_id, job.id, job.timeout)
.await
.0
.as_millis(),
backend/windmill-worker/src/pg_executor.rs
+2 -1
View File
@@ -222,12 +222,13 @@ pub async fn do_postgresql(
);
let timeout_ms = u64::try_from(
resolve_job_timeout(&db, &job.workspace_id, job.id, None)
resolve_job_timeout(&db, &job.workspace_id, job.id, job.timeout)
.await
.0
.as_millis(),
)
.unwrap_or(200000);
tracing::info!("Query timeout: {}ms", timeout_ms);
let result = tokio::select! {
biased;
result = tokio::time::timeout(std::time::Duration::from_millis(timeout_ms), result_f) => result