diff --git a/backend/sqlx-data.json b/backend/sqlx-data.json index 0c082f1fbc..e1d8fdf573 100644 --- a/backend/sqlx-data.json +++ b/backend/sqlx-data.json @@ -4853,55 +4853,6 @@ }, "query": "UPDATE schedule SET script_path = $1 WHERE script_path = $2 AND workspace_id = $3 AND is_flow IS false RETURNING *" }, - "c076993cd543ed00b4db578b9062eed512f73afc80fcd458207f17e17cde4697": { - "describe": { - "columns": [ - { - "name": "id", - "ordinal": 0, - "type_info": "Uuid" - }, - { - "name": "workspace_id", - "ordinal": 1, - "type_info": "Varchar" - }, - { - "name": "last_ping", - "ordinal": 2, - "type_info": "Timestamptz" - } - ], - "nullable": [ - false, - false, - false - ], - "parameters": { - "Left": [ - "Text", - { - "Custom": { - "kind": { - "Enum": [ - "script", - "preview", - "flow", - "dependencies", - "flowpreview", - "script_hub", - "identity", - "flowdependencies" - ] - }, - "name": "job_kind" - } - } - ] - } - }, - "query": "UPDATE queue SET running = false, started_at = null, logs = logs || '\nRestarted job after not receiving job''s ping for too long the ' || now() || '\n\n' WHERE last_ping < now() - ($1 || ' seconds')::interval AND running = true AND job_kind != $2 AND same_worker = false RETURNING id, workspace_id, last_ping" - }, "c07c9276945663d062cf0ff5b3323be681a0e2cb07a457ea9aede2daeff551cc": { "describe": { "columns": [ @@ -6458,6 +6409,72 @@ }, "query": "SELECT client, refresh_token FROM account WHERE workspace_id = $1 AND id = $2" }, + "fc2ec6fc4e22e46cc35b00503eff1eac35a6fdbc82a634b7eb9da4d7931f3582": { + "describe": { + "columns": [ + { + "name": "id", + "ordinal": 0, + "type_info": "Uuid" + }, + { + "name": "workspace_id", + "ordinal": 1, + "type_info": "Varchar" + }, + { + "name": "last_ping", + "ordinal": 2, + "type_info": "Timestamptz" + } + ], + "nullable": [ + false, + false, + false + ], + "parameters": { + "Left": [ + "Text", + { + "Custom": { + "kind": { + "Enum": [ + "script", + "preview", + "flow", + "dependencies", + "flowpreview", + "script_hub", + "identity", + "flowdependencies" + ] + }, + "name": "job_kind" + } + }, + { + "Custom": { + "kind": { + "Enum": [ + "script", + "preview", + "flow", + "dependencies", + "flowpreview", + "script_hub", + "identity", + "flowdependencies" + ] + }, + "name": "job_kind" + } + } + ] + } + }, + "query": "UPDATE queue SET running = false, started_at = null, logs = logs || '\nRestarted job after not receiving job''s ping for too long the ' || now() || '\n\n' WHERE last_ping < now() - ($1 || ' seconds')::interval AND running = true AND job_kind != $2 AND job_kind != $3 AND same_worker = false RETURNING id, workspace_id, last_ping" + }, "fcb6ce4fab662602827281e3e85fffaa48542f8d590100d0e7eead2ad4ad4873": { "describe": { "columns": [], diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs index 990cf53cb7..992fc2ad3b 100644 --- a/backend/windmill-worker/src/worker.rs +++ b/backend/windmill-worker/src/worker.rs @@ -2733,9 +2733,10 @@ pub async fn handle_zombie_jobs_periodically( async fn handle_zombie_jobs(db: &Pool, base_internal_url: &str) { if *RESTART_ZOMBIE_JOBS { let restarted = sqlx::query!( - "UPDATE queue SET running = false, started_at = null, logs = logs || '\nRestarted job after not receiving job''s ping for too long the ' || now() || '\n\n' WHERE last_ping < now() - ($1 || ' seconds')::interval AND running = true AND job_kind != $2 AND same_worker = false RETURNING id, workspace_id, last_ping", + "UPDATE queue SET running = false, started_at = null, logs = logs || '\nRestarted job after not receiving job''s ping for too long the ' || now() || '\n\n' WHERE last_ping < now() - ($1 || ' seconds')::interval AND running = true AND job_kind != $2 AND job_kind != $3 AND same_worker = false RETURNING id, workspace_id, last_ping", *ZOMBIE_JOB_TIMEOUT, JobKind::Flow: JobKind, + JobKind::FlowPreview: JobKind, ) .fetch_all(db) .await