NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot: differential kill and terminate

Browse Source
This commit is contained in:
Christophe Simonis 2014-06-24 15:58:11 +02:00
parent 38d1ed7d11
commit 684210c1c3
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
runbot/runbot.py
View File

@ -291,7 +291,7 @@ class runbot_repo(osv.osv):
# compute the number of testing job again # compute the number of testing job again
testing = bo.search(cr, uid, dom + [('state', '=', 'testing')], count=True) testing = bo.search(cr, uid, dom + [('state', '=', 'testing')], count=True)
# kill and reap doomed build # terminate and reap doomed build
build_ids = bo.search(cr, uid, dom + [('state', '=', 'running')]) build_ids = bo.search(cr, uid, dom + [('state', '=', 'running')])
# sort builds: the last build of each sticky branch then the rest # sort builds: the last build of each sticky branch then the rest
sticky = {} sticky = {}
@ -303,8 +303,8 @@ class runbot_repo(osv.osv):
non_sticky.append(build.id) non_sticky.append(build.id)
build_ids = sticky.values() build_ids = sticky.values()
build_ids += non_sticky build_ids += non_sticky
# kill extra running builds # terminate extra running builds
bo.kill(cr, uid, build_ids[repo.running:]) bo.terminate(cr, uid, build_ids[repo.running:])
bo.reap(cr, uid, build_ids) bo.reap(cr, uid, build_ids)
def nginx(self, cr, uid, context=None): def nginx(self, cr, uid, context=None):
@ -332,7 +332,7 @@ class runbot_repo(osv.osv):
# kill switch # kill switch
bo = self.pool['runbot.build'] bo = self.pool['runbot.build']
build_ids = bo.search(cr, uid, [('state', 'not in', ['done', 'pending'])]) build_ids = bo.search(cr, uid, [('state', 'not in', ['done', 'pending'])])
bo.kill(cr, uid, build_ids) bo.terminate(cr, uid, build_ids)
bo.reap(cr, uid, build_ids) bo.reap(cr, uid, build_ids)
def cron(self, cr, uid, ids=None, context=None): def cron(self, cr, uid, ids=None, context=None):
@ -755,22 +755,27 @@ class runbot_build(osv.osv):
# needed to prevent losing pids if multiple jobs are started and one them raise an exception # needed to prevent losing pids if multiple jobs are started and one them raise an exception
cr.commit() cr.commit()
def kill(self, cr, uid, ids, context=None): def terminate(self, cr, uid, ids, context=None):
for build in self.browse(cr, uid, ids, context=context): for build in self.browse(cr, uid, ids, context=context):
build.logger('killing %s', build.pid) build.logger('killing %s', build.pid)
build._log('kill', 'Kill build %s' % build.dest)
try: try:
os.killpg(build.pid, signal.SIGKILL) os.killpg(build.pid, signal.SIGKILL)
except OSError: except OSError:
pass pass
build.write({'state': 'done', 'result': 'killed', 'job': False}) build.write({'state': 'done'})
build.github_status()
cr.commit() cr.commit()
self.pg_dropdb(cr, uid, "%s-base" % build.dest) self.pg_dropdb(cr, uid, "%s-base" % build.dest)
self.pg_dropdb(cr, uid, "%s-all" % build.dest) self.pg_dropdb(cr, uid, "%s-all" % build.dest)
if os.path.isdir(build.path()): if os.path.isdir(build.path()):
shutil.rmtree(build.path()) shutil.rmtree(build.path())
def kill(self, cr, uid, ids, context=None):
for build in self.browse(cr, uid, ids, context=context):
build._log('kill', 'Kill build %s' % build.dest)
build.terminate()
build.write({'result': 'killed', 'job': False})
build.github_status()
def reap(self, cr, uid, ids): def reap(self, cr, uid, ids):
while True: while True:
try: try: