Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: jobrunner: use mpm_worker instead of mpm_prefork
......................................................................
jobrunner: use mpm_worker instead of mpm_prefork
Change-Id: I9a1d31c7e81ed56d51267dcb98b856d7e38df768
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
M modules/mediawiki/templates/jobrunner/site.conf.erb
3 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/mediawiki/manifests/jobrunner.pp
b/modules/mediawiki/manifests/jobrunner.pp
index c3f82eb..5dea85e 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,7 +12,7 @@
$runners_parsoid = 0,
$runners_transcode = 0,
$statsd_server = undef,
- $jr_port = 9002,
+ $port = 9002,
) {
include ::passwords::redis
@@ -67,14 +67,13 @@
if ubuntu_version('>= trusty') {
include ::apache::mod::proxy_fcgi
- # Temporarily disabled, need hhvm repackaging
- #class { 'apache::mpm':
- # mpm => 'worker',
- #}
+ class { 'apache::mpm':
+ mpm => 'worker',
+ }
apache::conf { 'hhvm_jobrunner_port':
priority => 1,
- content => inline_template("# This file is managed by
Puppet\nListen <%= @jr_port %>\n"),
+ content => inline_template("# This file is managed by
Puppet\nListen <%= @port %>\n"),
}
apache::site{ 'hhvm_jobrunner':
diff --git a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
index f0d6737..7708fed 100644
--- a/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
+++ b/modules/mediawiki/templates/jobrunner/dispatchers/trusty.erb
@@ -1 +1 @@
-curl -XPOST -s -a 'http:\/\/127.0.0.1:<%= @jr_port
%>\/rpc\/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'
+curl -XPOST -s -a 'http:\/\/127.0.0.1:<%= @port
%>\/rpc\/RunJobs.php?wiki=%(db)u&type=%(type)u&maxtime=%(maxtime)u&maxmem=%(maxmem)u'
diff --git a/modules/mediawiki/templates/jobrunner/site.conf.erb
b/modules/mediawiki/templates/jobrunner/site.conf.erb
index d28ad81..08382f6 100644
--- a/modules/mediawiki/templates/jobrunner/site.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/site.conf.erb
@@ -1,5 +1,5 @@
# This file is managed by Puppet
-<VirtualHost *:<%= @jr_port %>>
+<VirtualHost *:<%= @port %>>
DocumentRoot "/usr/local/apache/common"
# Pass requests to the HHVM FastCGI server
ProxyPassMatch ^/(.*\.php(/.*)?)$
fcgi://127.0.0.1:9000/usr/local/apache/common/$1
--
To view, visit https://gerrit.wikimedia.org/r/154032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9a1d31c7e81ed56d51267dcb98b856d7e38df768
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
