Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/147169
Change subject: Revert "mediawiki: use native min/floor funcs rather than
inline_template"
......................................................................
Revert "mediawiki: use native min/floor funcs rather than inline_template"
Error: Could not retrieve catalog from remote server: Error 400 on SERVER:
comparison of String with 98 failed at
/etc/puppet/modules/mediawiki/manifests/web.pp:20 on node mw1041.eqiad.wmnet
This reverts commit 3f266c6bb089256c4286f3caae2ec4f06a061ee5.
Change-Id: I28ef70cfbbe6af3808b45fa611ad47c189ae79cf
---
M modules/mediawiki/manifests/web.pp
1 file changed, 1 insertion(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/69/147169/1
diff --git a/modules/mediawiki/manifests/web.pp
b/modules/mediawiki/manifests/web.pp
index 9d57eac..6fa5b58 100644
--- a/modules/mediawiki/manifests/web.pp
+++ b/modules/mediawiki/manifests/web.pp
@@ -10,15 +10,11 @@
$apache_server_limit = 256
if is_integer($workers_limit) {
- $max_req_workers = min($apache_server_limit, $workers_limit)
+ $max_req_workers = $workers_limit
} else {
$mem_available = to_bytes($::memorytotal) * 0.7
$mem_per_worker = to_bytes('85M')
$max_req_workers = inline_template('<%= [( @mem_available /
@mem_per_worker ).to_i, @apache_server_limit.to_i].min %>')
-
- # testing min/floor
- $max_req_workers_test = min(floor($mem_available /$mem_per_worker),
$apache_Server_limit)
- notice("${max_req_workers} == ${max_req_workers_test}")
}
file { '/etc/apache2/apache2.conf':
--
To view, visit https://gerrit.wikimedia.org/r/147169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I28ef70cfbbe6af3808b45fa611ad47c189ae79cf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
