[MediaWiki-commits] [Gerrit] Use the new "dispatcher" config format and use curl with HHVM - change (operations/puppet)

[Ori.livneh (Code Review)]

Ori.livneh has submitted this change and it was merged.

Change subject: Use the new "dispatcher" config format and use curl with HHVM
......................................................................


Use the new "dispatcher" config format and use curl with HHVM

Change-Id: I06847ee2470bfc92b90a8cd4b502f3fdc222a178
---
M manifests/role/mediawiki.pp
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner.conf.erb
3 files changed, 11 insertions(+), 6 deletions(-)

Approvals:
  Ori.livneh: Verified; Looks good to me, approved



diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 0543ced..ce8f618 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -65,6 +65,7 @@
         queue_servers     => ['rdb1001.eqiad.wmnet', 'rdb1003.eqiad.wmnet'],
         statsd_server     => 'statsd.eqiad.wmnet:8125',
         runners_transcode => 5,
+        dispatcher_cmd    => "php 
/usr/local/apache/common/multiversion/MWScript.php runJobs.php --wiki=%(db)x 
--type=%(type)x --maxtime=%(maxtime)x --memory-limit=%(maxmem)x --result=json",
     }
 }
 
@@ -73,6 +74,10 @@
 
     include ::role::mediawiki::common
 
+    if $jobrunner_hhvm == undef {
+        $jobrunner_hhvm = false
+    }
+
     class { '::mediawiki::jobrunner':
         queue_servers   => ['rdb1001.eqiad.wmnet', 'rdb1003.eqiad.wmnet'],
         statsd_server   => 'statsd.eqiad.wmnet:8125',
@@ -80,10 +85,10 @@
         runners_parsoid => 20,
         runners_upload  => 7,
         runners_gwt     => 1,
-    }
-
-    if $jobrunner_hhvm == undef {
-        $jobrunner_hhvm = false
+        dispatcher_cmd  => $jobrunner_hhvm ? {
+            true    => "curl -XPOST -s -a 
'http://127.0.0.1:9002/rpc/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'",
+            default => "php /usr/local/apache/common/multiversion/MWScript.php 
runJobs.php --wiki=%(db)x --type=%(type)x --maxtime=%(maxtime)x 
--memory-limit=%(maxmem)x --result=json",
+        }
     }
 
     if ($jobrunner_hhvm and versioncmp($::lsbdistrelease, '14.04') > 0) {
diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index 4e4d282..f932897 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,6 +12,7 @@
     $runners_parsoid   = 0,
     $runners_transcode = 0,
     $statsd_server     = undef,
+    $dispatcher_cmd
 ) {
     include ::passwords::redis
 
diff --git a/modules/mediawiki/templates/jobrunner.conf.erb 
b/modules/mediawiki/templates/jobrunner.conf.erb
index a8647e4..8780507 100644
--- a/modules/mediawiki/templates/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner.conf.erb
@@ -91,6 +91,5 @@
     "statsd": "<%= @statsd_server %>",
     <%- end -%>
 
-    // HET deploy wrapper
-    "wrapper": "php /usr/local/apache/common/multiversion/MWScript.php"
+    "dispatcher": "<%= @dispatcher_cmd %>"
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/150900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I06847ee2470bfc92b90a8cd4b502f3fdc222a178
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits