From 4ca7a1d7888b3823ddca13e57b04b471f87d31a8 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 21 Nov 2025 13:47:55 +0100 Subject: [PATCH 1/4] streamline job ttl to 1 week --- app/Jobs/ProcessMediaWikiJobsJob.php | 2 +- app/Jobs/SpawnQueryserviceUpdaterJob.php | 2 +- app/Jobs/WikiEntityImportJob.php | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Jobs/ProcessMediaWikiJobsJob.php b/app/Jobs/ProcessMediaWikiJobsJob.php index 56e36dd7f..b3da65d10 100644 --- a/app/Jobs/ProcessMediaWikiJobsJob.php +++ b/app/Jobs/ProcessMediaWikiJobsJob.php @@ -74,7 +74,7 @@ public function handle(Client $kubernetesClient, MediaWikiHostResolver $resolver ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 0, + 'ttlSecondsAfterFinished' => 172800, // 1 week 'template' => [ 'metadata' => [ 'name' => 'run-all-mw-jobs', diff --git a/app/Jobs/SpawnQueryserviceUpdaterJob.php b/app/Jobs/SpawnQueryserviceUpdaterJob.php index d71f28a50..d08c84a08 100644 --- a/app/Jobs/SpawnQueryserviceUpdaterJob.php +++ b/app/Jobs/SpawnQueryserviceUpdaterJob.php @@ -67,7 +67,7 @@ public function handle(Client $kubernetesClient): void { ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 14 * 24 * 60 * 60, // 2 weeks + 'ttlSecondsAfterFinished' => 172800, // 1 week 'template' => [ 'metadata' => [ 'name' => 'run-qs-updater', diff --git a/app/Jobs/WikiEntityImportJob.php b/app/Jobs/WikiEntityImportJob.php index 441f8d690..324d7ccd7 100644 --- a/app/Jobs/WikiEntityImportJob.php +++ b/app/Jobs/WikiEntityImportJob.php @@ -142,7 +142,7 @@ public function spawn(): string { return $jobName; } - private function constructSpec(): array { + private function constructSpec(): array {g ad return [ 'metadata' => [ 'generateName' => 'run-transferbot-', @@ -153,7 +153,7 @@ private function constructSpec(): array { ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 0, + 'ttlSecondsAfterFinished' => 172800, // 1 week 'backoffLimit' => 0, 'template' => [ 'metadata' => [ From 9bb996e7a47b4a2f6352ab61bdaf42ca5bc697b2 Mon Sep 17 00:00:00 2001 From: dena <91744937+deer-wmde@users.noreply.github.com> Date: Fri, 21 Nov 2025 13:59:42 +0100 Subject: [PATCH 2/4] Update WikiEntityImportJob.php --- app/Jobs/WikiEntityImportJob.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/WikiEntityImportJob.php b/app/Jobs/WikiEntityImportJob.php index 324d7ccd7..b62bb5510 100644 --- a/app/Jobs/WikiEntityImportJob.php +++ b/app/Jobs/WikiEntityImportJob.php @@ -142,7 +142,7 @@ public function spawn(): string { return $jobName; } - private function constructSpec(): array {g ad + private function constructSpec(): array { return [ 'metadata' => [ 'generateName' => 'run-transferbot-', From cb0996120f696aefc9f6c3e036cba720d0a46d72 Mon Sep 17 00:00:00 2001 From: dena Date: Thu, 4 Dec 2025 16:02:17 +0100 Subject: [PATCH 3/4] add calculations --- app/Jobs/ProcessMediaWikiJobsJob.php | 2 +- app/Jobs/SpawnQueryserviceUpdaterJob.php | 2 +- app/Jobs/WikiEntityImportJob.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Jobs/ProcessMediaWikiJobsJob.php b/app/Jobs/ProcessMediaWikiJobsJob.php index b3da65d10..16c0d644a 100644 --- a/app/Jobs/ProcessMediaWikiJobsJob.php +++ b/app/Jobs/ProcessMediaWikiJobsJob.php @@ -74,7 +74,7 @@ public function handle(Client $kubernetesClient, MediaWikiHostResolver $resolver ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 172800, // 1 week + 'ttlSecondsAfterFinished' => 24 * 60 * 60 * 7, // 1 week 'template' => [ 'metadata' => [ 'name' => 'run-all-mw-jobs', diff --git a/app/Jobs/SpawnQueryserviceUpdaterJob.php b/app/Jobs/SpawnQueryserviceUpdaterJob.php index d08c84a08..925236431 100644 --- a/app/Jobs/SpawnQueryserviceUpdaterJob.php +++ b/app/Jobs/SpawnQueryserviceUpdaterJob.php @@ -67,7 +67,7 @@ public function handle(Client $kubernetesClient): void { ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 172800, // 1 week + 'ttlSecondsAfterFinished' => 24 * 60 * 60 * 7, // 1 week 'template' => [ 'metadata' => [ 'name' => 'run-qs-updater', diff --git a/app/Jobs/WikiEntityImportJob.php b/app/Jobs/WikiEntityImportJob.php index b62bb5510..bc4976a6d 100644 --- a/app/Jobs/WikiEntityImportJob.php +++ b/app/Jobs/WikiEntityImportJob.php @@ -153,7 +153,7 @@ private function constructSpec(): array { ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 172800, // 1 week + 'ttlSecondsAfterFinished' => 24 * 60 * 60 * 7, // 1 week 'backoffLimit' => 0, 'template' => [ 'metadata' => [ From 9339e2a813903b69976db112c76be96e31c62538 Mon Sep 17 00:00:00 2001 From: Ollie <43674967+outdooracorn@users.noreply.github.com> Date: Mon, 8 Dec 2025 16:59:03 +0000 Subject: [PATCH 4/4] Add comment to app/Jobs/ProcessMediaWikiJobsJob.php Co-authored-by: Thomas Arrow --- app/Jobs/ProcessMediaWikiJobsJob.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Jobs/ProcessMediaWikiJobsJob.php b/app/Jobs/ProcessMediaWikiJobsJob.php index 16c0d644a..7fdb32671 100644 --- a/app/Jobs/ProcessMediaWikiJobsJob.php +++ b/app/Jobs/ProcessMediaWikiJobsJob.php @@ -74,7 +74,8 @@ public function handle(Client $kubernetesClient, MediaWikiHostResolver $resolver ], ], 'spec' => [ - 'ttlSecondsAfterFinished' => 24 * 60 * 60 * 7, // 1 week + // This is set to immediately expire since the name of the job is used as the lock to prevent creating duplicates of this Kubernetes Job for any given Wiki. + 'ttlSecondsAfterFinished' => 0, 'template' => [ 'metadata' => [ 'name' => 'run-all-mw-jobs',