From 4e935a1c2b18778501f464574ecd20a8fcba0ccd Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Fri, 15 Sep 2023 04:43:23 -0400 Subject: [PATCH] worker details --- .../down.sql | 7 +++++++ .../up.sql | 15 +++++++++++++++ _sql/migrations_squashed/media_files.sql | 5 +---- .../insert_media_file_from_face_animation.rs | 18 ++++++------------ .../lipsync/sad_talker/process_job.rs | 1 - 5 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 _sql/migrations/2023-09-15-083401_alter_media_files_add_workers/down.sql create mode 100644 _sql/migrations/2023-09-15-083401_alter_media_files_add_workers/up.sql diff --git a/_sql/migrations/2023-09-15-083401_alter_media_files_add_workers/down.sql b/_sql/migrations/2023-09-15-083401_alter_media_files_add_workers/down.sql new file mode 100644 index 0000000000..faa7226065 --- /dev/null +++ b/_sql/migrations/2023-09-15-083401_alter_media_files_add_workers/down.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files DROP COLUMN generated_by_cluster; +ALTER TABLE media_files DROP COLUMN generated_by_worker; +ALTER TABLE media_files DROP COLUMN is_generated_on_prem; diff --git a/_sql/migrations/2023-09-15-083401_alter_media_files_add_workers/up.sql b/_sql/migrations/2023-09-15-083401_alter_media_files_add_workers/up.sql new file mode 100644 index 0000000000..6780aded7c --- /dev/null +++ b/_sql/migrations/2023-09-15-083401_alter_media_files_add_workers/up.sql @@ -0,0 +1,15 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN is_generated_on_prem BOOLEAN NOT NULL DEFAULT FALSE + AFTER maybe_mod_user_token; + +ALTER TABLE media_files + ADD COLUMN generated_by_worker VARCHAR(255) DEFAULT NULL + AFTER is_generated_on_prem; + +ALTER TABLE media_files + ADD COLUMN generated_by_cluster VARCHAR(255) DEFAULT NULL + AFTER generated_by_worker; diff --git a/_sql/migrations_squashed/media_files.sql b/_sql/migrations_squashed/media_files.sql index 6ba382c023..2dcb6aeef2 100644 --- a/_sql/migrations_squashed/media_files.sql +++ b/_sql/migrations_squashed/media_files.sql @@ -142,10 +142,6 @@ CREATE TABLE media_files ( -- ========== INFERENCE METADATA, DC, ROUTING, DEBUGGING ========== - -- If true, the request was routed to a special "debug" worker. - -- Or perhaps uploaded with a debug flag. - is_debug BOOLEAN NOT NULL DEFAULT FALSE, - -- For inference and processing, whether we generated this result from -- our own data center (vs. cloud). is_generated_on_prem BOOLEAN NOT NULL DEFAULT FALSE, @@ -154,6 +150,7 @@ CREATE TABLE media_files ( -- Worker hostname (linux hostname, k8s pod name) generated_by_worker VARCHAR(255) DEFAULT NULL, + -- For inference or processing, which cluster handled the processing. -- Cluster name (k8s) generated_by_cluster VARCHAR(255) DEFAULT NULL, diff --git a/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs b/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs index 9222895a7d..e12aaebb6a 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/insert_media_file_from_face_animation.rs @@ -26,7 +26,6 @@ pub struct InsertArgs<'a> { pub is_on_prem: bool, pub worker_hostname: &'a str, pub worker_cluster: &'a str, - pub is_debug_worker: bool, } pub async fn insert_media_file_from_face_animation( @@ -91,8 +90,11 @@ SET creator_set_visibility = ?, maybe_creator_file_synthetic_id = ?, - maybe_creator_category_synthetic_id = ? + maybe_creator_category_synthetic_id = ?, + is_generated_on_prem = ?, + generated_by_worker = ?, + generated_by_cluster = ? "#, result_token.as_str(), @@ -116,21 +118,13 @@ SET maybe_creator_file_synthetic_id, maybe_creator_category_synthetic_id, - - - - /*args.is_on_prem, + args.is_on_prem, args.worker_hostname, - args.worker_cluster, - args.is_debug_worker,*/ + args.worker_cluster ) .execute(&mut transaction) .await; - /*is_generated_on_prem = ?, - generated_by_worker = ?, - generated_by_cluster = ?, - is_debug_request = ?*/ let record_id = match query_result { Ok(res) => { res.last_insert_id() diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs index 6eaa71c318..f32dcbe9f6 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs @@ -211,7 +211,6 @@ pub async fn process_job(args: SadTalkerProcessJobArgs<'_>) -> Result