From e77397fc1de324dfc6d7b515e9440bd564311dd9 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@gmail.com>
Date: Fri, 8 Mar 2013 10:51:55 +0100
Subject: [PATCH] (Bug 45854) Unset the cgroup if we don't have a memory limit
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

We only create the cgroup if there's a memory limit, but it
tried to always cleanup it, regardless if it was used or not,
resulting in a «/sys/fs/cgroup/memory/mediawiki/job/32466/tasks:
No such file or directory» error, when run with MW_CGROUP='mediawiki';
MW_MEM_LIMIT=0

Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f
---
 includes/limit.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/includes/limit.sh b/includes/limit.sh
index 44b9edc272..bc1988de49 100644
--- a/includes/limit.sh
+++ b/includes/limit.sh
@@ -36,6 +36,8 @@ if [ "$MW_MEM_LIMIT" -gt 0 ]; then
 	else
 		ulimit -v "$MW_MEM_LIMIT"
 	fi
+else
+	MW_CGROUP=""
 fi
 if [ "$MW_FILE_SIZE_LIMIT" -gt 0 ]; then
 	ulimit -f "$MW_FILE_SIZE_LIMIT"
-- 
2.20.1