From 9c9905f69df974c1cbe123558ebc86e921d32f12 Mon Sep 17 00:00:00 2001 From: Aurelien Jarno Date: Fri, 28 Aug 2015 12:17:50 +0200 Subject: [PATCH] buildds: kill aptitude after 10 minutes OR all RAM used Instead of 10 minutes AND all RAM used. It takes ages to fill all the RAM on machines with 8GB or 32GB. --- modules/buildd/files/buildd-schroot-aptitude-kill | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill b/modules/buildd/files/buildd-schroot-aptitude-kill index 5e90d77e..fa737464 100755 --- a/modules/buildd/files/buildd-schroot-aptitude-kill +++ b/modules/buildd/files/buildd-schroot-aptitude-kill @@ -54,10 +54,8 @@ for p in psutil.process_iter(): 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 + if used < total_mem and cputime < cutoff_time: continue # p.kill() except psutil.NoSuchProcess: -- 2.39.2