jenkins-bot has submitted this change and it was merged.
Change subject: Tuned down default number of parsoid workers
......................................................................
Tuned down default number of parsoid workers
Lowered the default MWV memory footprint by a couple hundred MB by
reducing the number of parsoid workers.
Change-Id: Ia0a8b690bc680eea733946cded24faccf97927f6
---
M puppet/hieradata/common.yaml
M puppet/modules/mediawiki/manifests/parsoid.pp
M puppet/modules/mediawiki/templates/parsoid.conf.erb
3 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index b438e95..999b7ab 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -39,6 +39,7 @@
mediawiki::parsoid::use_php_preprocessor: true
mediawiki::parsoid::use_selser: true
mediawiki::parsoid::allow_cors: '*'
+mediawiki::parsoid::workers: 2
mysql::default_db_name: wiki
mysql::root_password: vagrant
diff --git a/puppet/modules/mediawiki/manifests/parsoid.pp
b/puppet/modules/mediawiki/manifests/parsoid.pp
index ad9da9b..58a3aa1 100644
--- a/puppet/modules/mediawiki/manifests/parsoid.pp
+++ b/puppet/modules/mediawiki/manifests/parsoid.pp
@@ -24,6 +24,9 @@
# Domains that should be permitted to make cross-domain requests.
# If false or undefined, disables CORS.
#
+# [*workers*]
+# Number of worker processes to fork.
+#
# === Examples
#
# class { 'mediawiki::parsoid':
@@ -36,6 +39,7 @@
$use_php_preprocessor,
$use_selser,
$allow_cors,
+ $workers,
) {
include ::mediawiki
@@ -50,7 +54,6 @@
path => "${dir}/src/api/localsettings.js",
content => template('mediawiki/parsoid.localsettings.js.erb'),
require => Git::Clone['mediawiki/services/parsoid/deploy'],
- notify => Service['parsoid'],
}
file { '/etc/init/parsoid.conf':
@@ -66,6 +69,6 @@
service { 'parsoid':
ensure => running,
provider => 'upstart',
- require => File['localsettings.js', '/etc/init/parsoid.conf'],
+ subscribe => File['localsettings.js', '/etc/init/parsoid.conf'],
}
}
diff --git a/puppet/modules/mediawiki/templates/parsoid.conf.erb
b/puppet/modules/mediawiki/templates/parsoid.conf.erb
index af68918..419c086 100644
--- a/puppet/modules/mediawiki/templates/parsoid.conf.erb
+++ b/puppet/modules/mediawiki/templates/parsoid.conf.erb
@@ -15,6 +15,6 @@
env NODE_PATH="<%= @dir %>/node_modules"
chdir "<%= @dir %>"
-exec node src/api/server.js
+exec node src/api/server.js --num-workers <%= @workers %>
respawn
--
To view, visit https://gerrit.wikimedia.org/r/155854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0a8b690bc680eea733946cded24faccf97927f6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Dduvall <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
