From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 2 May 2013 16:17:22 +0000 (+0200)
Subject: Kill broken aptitudes on wheezy buildds
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=6daebec74370abf74954a830aa40170a0b5f7bf4

Kill broken aptitudes on wheezy buildds
---

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill
new file mode 100755
index 00000000..220e9df9
--- /dev/null
+++ b/modules/buildd/files/buildd-schroot-aptitude-kill
@@ -0,0 +1,47 @@
+#!/usr/bin/python
+
+# kills aptitude processes that eat an excessive amount of resources
+
+# Copyright 2013 Peter Palfrader
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+import os
+import psutil
+
+total_mem = psutil.phymem_usage().total
+cutoff_time = 60*10
+
+for p in psutil.process_iter():
+	if p.name != 'aptitude': continue
+	parent = p.parent
+	if parent is None: continue
+	if parent.name != 'schroot': continue
+	#
+	rootdir = os.readlink('/proc/%d/root'%(p.pid,))
+	if not rootdir.startswith('/var/lib/schroot/mount'): continue
+	#
+	used = p.get_memory_info().vms
+	if used < total_mem: continue
+	#
+	cputime = p.get_cpu_times().user
+	if cputime < cutoff_time: continue
+	#
+	p.kill()
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index dcf6fe74..6b6e7162 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -76,4 +76,17 @@ class buildd ($ensure=present) {
 		source  => 'puppet:///modules/buildd/cron.d-dsa-buildd',
 		require => Package['debian.org']
 	}
+
+	if $::lsbmajdistrelease >= 7 {
+		package { 'python-psutil':
+			ensure => installed,
+		}
+		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+			source  => 'puppet:///modules/buildd/dupload.conf',
+			mode    => '0555',
+		}
+		file { '/etc/cron.d/puppet-buildd-aptitude':
+			content => "*/5 * * * * root /usr/local/sbin/buildd-schroot-aptitude-kill\n",
+		}
+	}
 }