Tim Starling has submitted this change and it was merged.
Change subject: Use a cgroup for command execution
......................................................................
Use a cgroup for command execution
See DefaultSettings.php after Ic8362cab for the rationale.
Change-Id: I3f6a8b0ae9f0be149e51fa935848346c34de343a
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Tim Starling: Verified; Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 0b24e41..314a32d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1644,6 +1644,12 @@
}
$wgMaxShellTime = 50; // so it times out before PHP and curl and squid
+// Use a cgroup for shell execution.
+// This will cause shell execution to fail if the cgroup is not installed.
+// If some misc server doesn't have the cgroup installed, you can create it
+// with: mkdir -p -m777 /sys/fs/cgroup/memory/mediawiki/job
+$wgShellCgroup = '/sys/fs/cgroup/memory/mediawiki/job';
+
switch( $wmfRealm ) {
case 'production' :
$wgImageMagickTempDir = '/a/magick-tmp';
--
To view, visit https://gerrit.wikimedia.org/r/49000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f6a8b0ae9f0be149e51fa935848346c34de343a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
