Gilles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315248

Change subject: Add memory limit to Thumbor subprocesses
......................................................................

Add memory limit to Thumbor subprocesses

Refs T145623

Change-Id: I804637066dab6a0d125498cb5c8f6fc6b8a7c501
---
M modules/thumbor/manifests/init.pp
1 file changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/48/315248/1

diff --git a/modules/thumbor/manifests/init.pp 
b/modules/thumbor/manifests/init.pp
index 14b2fc2..a333b23 100644
--- a/modules/thumbor/manifests/init.pp
+++ b/modules/thumbor/manifests/init.pp
@@ -116,4 +116,22 @@
     grub::bootparam { 'swapaccount':
         value => '1',
     }
+
+    cgred::group {'thumbor-subprocesses':
+        config => {
+            memory => {
+                'memory.limit_in_bytes' => '838860800', # 800MB
+            },
+        },
+        rules  => [
+            '*:/usr/bin/ddjvu           memory   /thumbor-subprocesses',
+            '*:/usr/bin/exiftool        memory   /thumbor-subprocesses',
+            '*:/usr/bin/ffmpeg          memory   /thumbor-subprocesses',
+            '*:/usr/bin/ffprobe         memory   /thumbor-subprocesses',
+            '*:/usr/bin/gs              memory   /thumbor-subprocesses',
+            '*:/usr/bin/rsvg-convert    memory   /thumbor-subprocesses',
+            '*:/usr/bin/xcf2png         memory   /thumbor-subprocesses',
+            '*:/usr/bin/vips            memory   /thumbor-subprocesses',
+        ],
+    }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/315248
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I804637066dab6a0d125498cb5c8f6fc6b8a7c501
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to