From: Paul Wise <pabs@debian.org>
Date: Mon, 29 Sep 2014 04:32:28 +0000 (+0800)
Subject: Halve the number of munin-html jobs, to prevent OOM errors due to fork count.
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=6aaeb4fa592ac8c3a1473217935af678d1842ae2;hp=696875f82762047b983d1f002ca9a88d458e64b5;p=mirror%2Fdsa-puppet.git

Halve the number of munin-html jobs, to prevent OOM errors due to fork count.

Should prevent mails like these:

Cron <munin@menotti> nice /usr/share/munin/munin-html
Killed

Cron <munin@menotti> nice /usr/share/munin/munin-html
fork failed: Cannot allocate memory at /usr/share/perl5/Munin/Master/HTMLOld.pm line 776.
---

diff --git a/modules/munin/templates/munin.conf.erb b/modules/munin/templates/munin.conf.erb
index 80d0c7e9f..21997e475 100644
--- a/modules/munin/templates/munin.conf.erb
+++ b/modules/munin/templates/munin.conf.erb
@@ -10,4 +10,7 @@ rrdcached_socket /var/run/munin/rrdcached.sock/sock
 #html_strategy cgi
 graph_strategy cgi
 
+# Reduce memory usage spikes and OOM mails
+max_html_jobs 3
+
 includedir /etc/munin/munin-conf.d