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

[IMP] runbot: gc database faster if corresponding build has parent_id

Browse Source
This commit is contained in:
Xavier-Do 2019-10-22 16:55:12 +02:00
parent c874f4a046
commit 18b37d9002
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runbot/models/build.py
View File

@ -458,7 +458,7 @@ class runbot_build(models.Model):
return return
_logger.debug('Local cleaning') _logger.debug('Local cleaning')
def cleanup(dest_list, func, max_days, label): def cleanup(dest_list, func, max_days_main, max_days_child, label):
dest_by_builds_ids = defaultdict(list) dest_by_builds_ids = defaultdict(list)
ignored = set() ignored = set()
for dest in dest_list: for dest in dest_list:
@ -478,7 +478,7 @@ class runbot_build(models.Model):
dest_list = [dest for sublist in [dest_by_builds_ids[rem_id] for rem_id in remaining.ids] for dest in sublist] dest_list = [dest for sublist in [dest_by_builds_ids[rem_id] for rem_id in remaining.ids] for dest in sublist]
_logger.debug('(%s) (%s) not deleted because no corresponding build found' % (label, " ".join(dest_list))) _logger.debug('(%s) (%s) not deleted because no corresponding build found' % (label, " ".join(dest_list)))
for build in existing: for build in existing:
if fields.Datetime.from_string(build.job_end or build.create_date) + datetime.timedelta(days=max_days) < datetime.datetime.now(): if fields.Datetime.from_string(build.job_end or build.create_date) + datetime.timedelta(days=(max_days_main if not build.parent_id else int(max_days_child / 2))) < datetime.datetime.now():
if build.local_state == 'done': if build.local_state == 'done':
for db in dest_by_builds_ids[build.id]: for db in dest_by_builds_ids[build.id]:
func(db) func(db)
@ -486,7 +486,8 @@ class runbot_build(models.Model):
_logger.warning('db (%s) not deleted because state is not done' % " ".join(dest_by_builds_ids[build.id])) _logger.warning('db (%s) not deleted because state is not done' % " ".join(dest_by_builds_ids[build.id]))
icp = self.env['ir.config_parameter'] icp = self.env['ir.config_parameter']
max_days = int(icp.get_param('runbot.db_gc_days', default=30)) max_days_main = int(icp.get_param('runbot.db_gc_days', default=30))
max_days_child = int(icp.get_param('runbot.db_gc_days_child', default=15))
with local_pgadmin_cursor() as local_cr: with local_pgadmin_cursor() as local_cr:
local_cr.execute(""" local_cr.execute("""
SELECT datname SELECT datname
@ -495,7 +496,7 @@ class runbot_build(models.Model):
""") """)
existing_db = [d[0] for d in local_cr.fetchall()] existing_db = [d[0] for d in local_cr.fetchall()]
cleanup(dest_list=existing_db, func=self._local_pg_dropdb, max_days=max_days, label='db') cleanup(dest_list=existing_db, func=self._local_pg_dropdb, max_days_main=max_days_main, max_days_child=max_days_child, label='db')
root = self.env['runbot.repo']._root() root = self.env['runbot.repo']._root()
build_dir = os.path.join(root, 'build') build_dir = os.path.join(root, 'build')
@ -632,6 +633,7 @@ class runbot_build(models.Model):
_logger.exception('An error occured while computing results') _logger.exception('An error occured while computing results')
build._log('_make_results', 'An error occured while computing results', level='ERROR') build._log('_make_results', 'An error occured while computing results', level='ERROR')
results = {'local_result': 'ko'} results = {'local_result': 'ko'}
build_values.update(results) build_values.update(results)
build.active_step.log_end(build) build.active_step.log_end(build)