[MediaWiki-commits] [Gerrit] (Bug 45854) Unset the cgroup if we don't have a memory limit - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review. https://gerrit.wikimedia.org/r/53179 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 (cherry picked from commit e77397fc1de324dfc6d7b515e9440bd564311dd9) --- M includes/limit.sh 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/79/53179/1 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/53179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.21wmf11 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Platonides platoni...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45854) Unset the cgroup if we don't have a memory limit - change (mediawiki/core)
Aaron Schulz 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 (cherry picked from commit e77397fc1de324dfc6d7b515e9440bd564311dd9) --- M includes/limit.sh 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Aaron Schulz: Verified; Looks good to me, approved jenkins-bot: Checked 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/53179 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: wmf/1.21wmf11 Gerrit-Owner: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: Platonides platoni...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45854) Unset the cgroup if we don't have a memory limit - change (mediawiki/core)
Platonides has uploaded a new change for review. https://gerrit.wikimedia.org/r/52780 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(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/80/52780/1 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: newchange Gerrit-Change-Id: I7fdb545b336ead62aa743b1bc3afdbfba2c3113f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Platonides platoni...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] (Bug 45854) Unset the cgroup if we don't have a memory limit - change (mediawiki/core)
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 platoni...@gmail.com Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
