(Bug 45854) Unset the cgroup if we don't have a memory limit
authorPlatonides <platonides@gmail.com>
Fri, 8 Mar 2013 09:51:55 +0000 (10:51 +0100)
committerPlatonides <platonides@gmail.com>
Fri, 8 Mar 2013 09:51:55 +0000 (10:51 +0100)
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

index 44b9edc..bc1988d 100644 (file)
@@ -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"