From: Tollef Fog Heen <tfheen@err.no>
Date: Mon, 6 May 2013 14:55:49 +0000 (+0200)
Subject: Ignore processes that have disappeared by themselves
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=e3126d1408e005285d5cab06f4d7144461f43b11;hp=eaf1930a1be5fe410877727b8f6a353568344c3f;p=mirror%2Fdsa-puppet.git

Ignore processes that have disappeared by themselves
---

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill
index 220e9df99..07f75c1de 100755
--- a/modules/buildd/files/buildd-schroot-aptitude-kill
+++ b/modules/buildd/files/buildd-schroot-aptitude-kill
@@ -30,18 +30,21 @@ 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()
+	try:
+		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()
+	except psutil.error.NoSuchProcess:
+		pass