Giuseppe Lavagetto has submitted this change and it was merged. Change subject: Add restbase job runners ......................................................................
Add restbase job runners This adds dedicated job runners in order to manage priorities basically the same way we already do for Parsoid. The RESTBase update extension was just enabled on testwiki via https://gerrit.wikimedia.org/r/#/c/195348/, but so far the jobs just end up in the default queue. Marko is prepping the job exclusion setting in wmf-config, and this patch will provide the runners for the separate queues. The number of restbase jobrunners has been reduced to 1 until T92490 has been resolved. Change-Id: I70a841b8e6b19482af727515891f887ee391d955 --- M hieradata/labs/deployment-prep/common.yaml M hieradata/role/common/mediawiki/jobrunner.yaml M modules/mediawiki/manifests/jobrunner.pp M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb 4 files changed, 15 insertions(+), 0 deletions(-) Approvals: Giuseppe Lavagetto: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index f21a2a5..05f9242 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -122,6 +122,7 @@ "mediawiki::jobrunner::statsd_server": labmon1001.eqiad.wmnet "mediawiki::jobrunner::runners_basic": 5 "mediawiki::jobrunner::runners_parsoid": 5 +"mediawiki::jobrunner::runners_restbase": 5 "mediawiki::jobrunner::runners_upload": 2 "mediawiki::jobrunner::runners_gwt": 1 "role::logging::mediawiki::log_directory": /data/project/logs diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml b/hieradata/role/common/mediawiki/jobrunner.yaml index da4cdec..4cdb6fa 100644 --- a/hieradata/role/common/mediawiki/jobrunner.yaml +++ b/hieradata/role/common/mediawiki/jobrunner.yaml @@ -3,6 +3,8 @@ - deployment mediawiki::jobrunner::runners_basic: 14 mediawiki::jobrunner::runners_parsoid: 4 +# Do not raise this value until T92490 is resolved +mediawiki::jobrunner::runners_restbase: 1 mediawiki::jobrunner::runners_upload: 7 mediawiki::jobrunner::runners_gwt: 1 mediawiki::users::web: www-data diff --git a/modules/mediawiki/manifests/jobrunner.pp b/modules/mediawiki/manifests/jobrunner.pp index 2891c73..a13a612 100644 --- a/modules/mediawiki/manifests/jobrunner.pp +++ b/modules/mediawiki/manifests/jobrunner.pp @@ -10,6 +10,7 @@ $runners_upload = 0, $runners_gwt = 0, $runners_parsoid = 0, + $runners_restbase = 0, $runners_transcode = 0, $statsd_server = undef, $port = 9005, diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb index 9ad30ae..25409fb 100644 --- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb +++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb @@ -11,6 +11,8 @@ "AssembleUploadChunks", "ParsoidCacheUpdateJobOnDependencyChange", "ParsoidCacheUpdateJobOnEdit", + "RestbaseUpdateJobOnEdit", + "RestbaseUpdateJobOnDependencyChange", "PublishStashedFile", "gwtoolsetGWTFileBackendCleanupJob", "gwtoolsetUploadMediafileJob", @@ -41,6 +43,15 @@ "ParsoidCacheUpdateJobOnDependencyChange" ] }, + "restbase": { + "runners": <%= @runners_restbase %>, + "include": [ + "RestbaseUpdateJobOnEdit" + ], + "low-priority": [ + "RestbaseUpdateJobOnDependencyChange" + ] + }, "transcode": { "runners": <%= @runners_transcode %>, "include": [ -- To view, visit https://gerrit.wikimedia.org/r/195364 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70a841b8e6b19482af727515891f887ee391d955 Gerrit-PatchSet: 6 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Eevans <eev...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org> Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org> Gerrit-Reviewer: RobH <r...@wikimedia.org> Gerrit-Reviewer: Rush <r...@wikimedia.org> Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
