jenkins-bot has submitted this change and it was merged.
Change subject: (Bug 45854) Unset the cgroup if we don't have a memory limit
......................................................................
(Bug 45854) Unset the cgroup if we don't have a memory limit
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
---
M includes/limit.sh
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/limit.sh b/includes/limit.sh
index 44b9edc..bc1988d 100644
--- a/includes/limit.sh
+++ b/includes/limit.sh
@@ -36,6 +36,8 @@
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"
--
To view, visit https://gerrit.wikimedia.org/r/52780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
