jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/346634 )
Change subject: dib: allow Linux memory overcommit on Trusty ...................................................................... dib: allow Linux memory overcommit on Trusty So that a PHPUnit process using 2GBytes RAM can still be able to fork when there is not "enough" memory left. See https://phabricator.wikimedia.org/T125050#3153574 Bug: T125050 Change-Id: Idaffc7657a0dd548838467e2c8c376f98ea70d03 --- M dib/puppet/ciimage.pp 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/dib/puppet/ciimage.pp b/dib/puppet/ciimage.pp index af2bd2c..c1a072c 100644 --- a/dib/puppet/ciimage.pp +++ b/dib/puppet/ciimage.pp @@ -37,6 +37,19 @@ include contint::packages::apt include contint::packages::php +if os_version('ubuntu == trusty') { + # MediaWiki PHPunit under Zend 5.5 (Trusty) can use 2GBytes. An attempt to + # proc_open() invokes fork() which clone the Virtual Memory. Although it is + # copy-on-write, Linux still check whether the system will be able to honor + # a full allocation. Allow the Linux memory manager to overcommit memory. + # + # https://phabricator.wikimedia.org/T125050#3153574 + # https://www.kernel.org/doc/Documentation/vm/overcommit-accounting + sysctl::parameters { 'vm.overcommit_memory': + values => { 'vm.overcommit_memory' => 1 }, + } +} + require_package('arcanist') require_package('php5-xhprof') -- To view, visit https://gerrit.wikimedia.org/r/346634 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idaffc7657a0dd548838467e2c8c376f98ea70d03 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Paladox <[email protected]> Gerrit-Reviewer: Platonides <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
