From feb49e9561a0a54e5f4cd3c3bafd80e94774eef5 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sat, 20 Aug 2022 17:00:50 +0200 Subject: [PATCH] fix(backend): started_at info for completed_job is no more completed_at --- backend/sqlx-data.json | 96 +++++++++++++++++++++--------------------- backend/src/jobs.rs | 4 +- backend/src/worker.rs | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/backend/sqlx-data.json b/backend/sqlx-data.json index e5f3ad25ef..153438b5e9 100644 --- a/backend/sqlx-data.json +++ b/backend/sqlx-data.json @@ -1725,6 +1725,54 @@ "nullable": [] } }, + "84aa362a7f36f12efc1cddc24a124c0e6dff5adcc3f93dfa33a49725244d2e50": { + "query": "INSERT INTO completed_job as cj\n (workspace_id, id, parent_job, created_by, created_at, started_at, duration_ms, success, script_hash, script_path, args, result, logs, raw_code, canceled, canceled_by, canceled_reason, job_kind, schedule_path, permissioned_as, flow_status, raw_flow, is_flow_step, is_skipped)\n VALUES ($1, $2, $3, $4, $5, $6, EXTRACT(milliseconds FROM (now() - $6)), $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23)\n ON CONFLICT (id) DO UPDATE SET success = $7, result = $11, logs = concat(cj.logs, $12)", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Varchar", + "Uuid", + "Uuid", + "Varchar", + "Timestamptz", + "Timestamptz", + "Bool", + "Int8", + "Varchar", + "Jsonb", + "Jsonb", + "Text", + "Text", + "Bool", + "Varchar", + "Text", + { + "Custom": { + "name": "job_kind", + "kind": { + "Enum": [ + "script", + "preview", + "flow", + "dependencies", + "flowpreview", + "script_hub" + ] + } + } + }, + "Varchar", + "Varchar", + "Jsonb", + "Jsonb", + "Bool", + "Bool" + ] + }, + "nullable": [] + } + }, "88a3f58a1a315200fdd2e4bb8638246ee21818f8aaaf56f6e9d7ddce1490d886": { "query": "SELECT EXISTS(SELECT 1 FROM variable WHERE path = $1 AND workspace_id = $2)", "describe": { @@ -3190,54 +3238,6 @@ "nullable": [] } }, - "f9ecef1be461715bfe2d35c29721174c3a206455e150d33f344ed294ac314415": { - "query": "INSERT INTO completed_job as cj\n (workspace_id, id, parent_job, created_by, created_at, duration_ms, success, script_hash, script_path, args, result, logs, raw_code, canceled, canceled_by, canceled_reason, job_kind, schedule_path, permissioned_as, flow_status, raw_flow, is_flow_step, is_skipped)\n VALUES ($1, $2, $3, $4, $5, EXTRACT(milliseconds FROM (now() - $6)), $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20, $21, $22, $23)\n ON CONFLICT (id) DO UPDATE SET success = $7, result = $11, logs = concat(cj.logs, $12)", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar", - "Uuid", - "Uuid", - "Varchar", - "Timestamptz", - "Timestamptz", - "Bool", - "Int8", - "Varchar", - "Jsonb", - "Jsonb", - "Text", - "Text", - "Bool", - "Varchar", - "Text", - { - "Custom": { - "name": "job_kind", - "kind": { - "Enum": [ - "script", - "preview", - "flow", - "dependencies", - "flowpreview", - "script_hub" - ] - } - } - }, - "Varchar", - "Varchar", - "Jsonb", - "Jsonb", - "Bool", - "Bool" - ] - }, - "nullable": [] - } - }, "fa258894bd90ea6586669e5810c5c6bcb42d5e1e68fab27fb185d06962b6454a": { "query": "SELECT * FROM resource WHERE workspace_id = $1", "describe": { diff --git a/backend/src/jobs.rs b/backend/src/jobs.rs index 16db27f022..f264fad356 100644 --- a/backend/src/jobs.rs +++ b/backend/src/jobs.rs @@ -1312,11 +1312,11 @@ pub async fn add_completed_job( let job_id = queued_job.id.clone(); sqlx::query!( "INSERT INTO completed_job as cj - (workspace_id, id, parent_job, created_by, created_at, duration_ms, success, \ + (workspace_id, id, parent_job, created_by, created_at, started_at, duration_ms, success, \ script_hash, script_path, args, result, logs, \ raw_code, canceled, canceled_by, canceled_reason, job_kind, schedule_path, \ permissioned_as, flow_status, raw_flow, is_flow_step, is_skipped) - VALUES ($1, $2, $3, $4, $5, EXTRACT(milliseconds FROM (now() - $6)), $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, \ + VALUES ($1, $2, $3, $4, $5, $6, EXTRACT(milliseconds FROM (now() - $6)), $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, \ $18, $19, $20, $21, $22, $23) ON CONFLICT (id) DO UPDATE SET success = $7, result = $11, logs = concat(cj.logs, $12)", queued_job.workspace_id, diff --git a/backend/src/worker.rs b/backend/src/worker.rs index 322f70feaa..e08acdb93f 100644 --- a/backend/src/worker.rs +++ b/backend/src/worker.rs @@ -1750,7 +1750,7 @@ def main(): let worker_instance: &str = "test worker instance"; let worker_name: String = next_worker_name(); let i_worker: u64 = Default::default(); - let num_workers: u64 = Default::default(); + let num_workers: u64 = 2; let ip: &str = Default::default(); let sleep_queue: u64 = Default::default(); let base_url: &str = Default::default();