From: Jan Gerber <jgerber@wikimedia.org>
Date: Fri, 21 Dec 2012 10:19:35 +0000 (+0000)
Subject: limit memory via cgroups if available
X-Git-Tag: 1.31.0-rc.0~20769^2~1
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=dae7168b573db3cdff9aaf146db4cf003993974c;p=lhc%2Fweb%2Fwiklou.git

limit memory via cgroups if available

	If cgroups are setup use them to limit memory if run via ulimit5.sh
	Change I029a3999 enables cgroups on imagescalers

Change-Id: Iaa83812230214e448d436078a06bdc2ae9ae1e38
---

diff --git a/bin/ulimit5.sh b/bin/ulimit5.sh
index fd8aae2cd5..36c317650a 100644
--- a/bin/ulimit5.sh
+++ b/bin/ulimit5.sh
@@ -4,6 +4,15 @@ if [ "$1" -gt 0 ]; then
 	ulimit -t "$1"
 fi
 if [ "$2" -gt 0 ]; then
+	if [ -e /sys/fs/cgroup/memory/mediawiki/job/ ]; then
+		mkdir -m 0700 /sys/fs/cgroup/memory/mediawiki/job/$$
+		echo $$ > /sys/fs/cgroup/memory/mediawiki/job/$$/tasks
+		echo "1" > /sys/fs/cgroup/memory/mediawiki/job/$$/notify_on_release
+		#memory
+		echo $(($2*1024)) > /sys/fs/cgroup/memory/mediawiki/job/$$/memory.limit_in_bytes
+		#memory+swap
+		echo $(($2*1024)) > /sys/fs/cgroup/memory/mediawiki/job/$$/memory.memsw.limit_in_bytes
+	fi
 	ulimit -v "$2"
 fi
 if [ "$3" -gt 0 ]; then