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

[IMP] runbot: always keep one empty slot when assigning sheduled

Browse Source 
Nightly build have a low priority but once they have a slot, they keep it.
When pushing a branch or asking robodoo to nicelly merge a branch for the
third time at 22:00, there may be no slot left since all the nightly build are created.

This commit will only assign scheduled build if there is no other build to create and
will always keep a free slot for other builds.
This commit is contained in:
Xavier-Do 2019-06-13 10:51:20 +02:00 committed by XavierDo
parent 86ffeac589
commit bdc6506ede
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
runbot/models/repo.py
View File

@ -370,32 +370,44 @@ class runbot_repo(models.Model):
if available_slots > 0: if available_slots > 0:
if assignable_slots > 0: # note: slots have been addapt to be able to force host on pending build. Normally there is no pending with host. if assignable_slots > 0: # note: slots have been addapt to be able to force host on pending build. Normally there is no pending with host.
# commit transaction to reduce the critical section duration # commit transaction to reduce the critical section duration
def allocate_builds(where_clause, limit):
self.env.cr.commit() self.env.cr.commit()
# self-assign to be sure that another runbot instance cannot self assign the same builds # self-assign to be sure that another runbot instance cannot self assign the same builds
query = """UPDATE query = """UPDATE
runbot_build runbot_build
SET SET
host = %(host)s host = %%(host)s
WHERE WHERE
runbot_build.id IN ( runbot_build.id IN (
SELECT SELECT runbot_build.id
runbot_build.id FROM runbot_build
FROM LEFT JOIN runbot_branch
runbot_build ON runbot_branch.id = runbot_build.branch_id
LEFT JOIN runbot_branch ON runbot_branch.id = runbot_build.branch_id
WHERE WHERE
runbot_build.repo_id IN %(repo_ids)s runbot_build.repo_id IN %%(repo_ids)s
AND runbot_build.local_state = 'pending' AND runbot_build.local_state = 'pending'
AND runbot_build.host IS NULL AND runbot_build.host IS NULL
%s
ORDER BY ORDER BY
array_position(array['normal','rebuild','indirect','scheduled']::varchar[], runbot_build.build_type) ASC,
runbot_branch.sticky DESC, runbot_branch.sticky DESC,
runbot_branch.priority DESC, runbot_branch.priority DESC,
array_position(array['normal','rebuild','indirect','scheduled']::varchar[], runbot_build.build_type) ASC,
runbot_build.sequence ASC runbot_build.sequence ASC
FOR UPDATE OF runbot_build SKIP LOCKED FOR UPDATE OF runbot_build SKIP LOCKED
LIMIT %(assignable_slots)s)""" LIMIT %%(limit)s
)
RETURNING id""" % where_clause
self.env.cr.execute(query, {'repo_ids': tuple(ids), 'host': fqdn(), 'limit': limit})
return self.env.cr.fetchall()
allocated = allocate_builds("""AND runbot_build.build_type != 'scheduled'""", assignable_slots)
_logger.debug('Normal builds %s where allocated to runbot' % allocated)
weak_slot = assignable_slots - len(allocated) - 1
if weak_slot > 0:
allocated = allocate_builds('', weak_slot)
_logger.debug('Scheduled builds %s where allocated to runbot' % allocated)
self.env.cr.execute(query, {'repo_ids': tuple(ids), 'host': fqdn(), 'assignable_slots': assignable_slots})
pending_build = Build.search(domain_host + [('local_state', '=', 'pending')], limit=available_slots) pending_build = Build.search(domain_host + [('local_state', '=', 'pending')], limit=available_slots)
if pending_build: if pending_build:
pending_build._schedule() pending_build._schedule()