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

[IMP] runbot: add a separate pending count

Browse Source 
The assigned build are in the same count of the pending build. This can
sometimes create a false queue, because you can have 1000 pending builds
on one host, this doesn't mean that a new standard build cannot be
immediatly taken by another host. This is mainly to hide the false queue
created by the full charge zfs build currently running and creating
~400 assigned build.
This commit is contained in:
Xavier-Do 2023-03-23 16:11:00 +01:00 committed by Christophe Monniez
parent 74f0c8e1ad
commit 0d29643d52
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
runbot/controllers/frontend.py
View File

@ -73,10 +73,11 @@ class Runbot(Controller):
ICP = request.env['ir.config_parameter'].sudo().get_param ICP = request.env['ir.config_parameter'].sudo().get_param
warn = int(ICP('runbot.pending.warning', 5)) warn = int(ICP('runbot.pending.warning', 5))
crit = int(ICP('runbot.pending.critical', 12)) crit = int(ICP('runbot.pending.critical', 12))
pending_count = request.env['runbot.build'].search_count([('local_state', '=', 'pending'), ('build_type', '!=', 'scheduled')]) pending_count = request.env['runbot.build'].search_count([('local_state', '=', 'pending'), ('build_type', '!=', 'scheduled'), ('host', '=', False)])
scheduled_count = request.env['runbot.build'].search_count([('local_state', '=', 'pending'), ('build_type', '=', 'scheduled')]) scheduled_count = request.env['runbot.build'].search_count([('local_state', '=', 'pending'), ('build_type', '=', 'scheduled')])
pending_assigned_count = request.env['runbot.build'].search_count([('local_state', '=', 'pending'), ('build_type', '!=', 'scheduled'), ('host', '!=', False)])
level = ['info', 'warning', 'danger'][int(pending_count > warn) + int(pending_count > crit)] level = ['info', 'warning', 'danger'][int(pending_count > warn) + int(pending_count > crit)]
return pending_count, level, scheduled_count return pending_count, level, scheduled_count, pending_assigned_count
@o_route([ @o_route([
'/runbot/submit' '/runbot/submit'
@ -112,12 +113,13 @@ class Runbot(Controller):
if not project and projects: if not project and projects:
project = projects[0] project = projects[0]
pending_count, level, scheduled_count = self._pending() pending_count, level, scheduled_count, pending_assigned_count = self._pending()
context = { context = {
'categories': categories, 'categories': categories,
'search': search, 'search': search,
'message': request.env['ir.config_parameter'].sudo().get_param('runbot.runbot_message'), 'message': request.env['ir.config_parameter'].sudo().get_param('runbot.runbot_message'),
'pending_total': pending_count, 'pending_count': pending_count,
'pending_assigned_count': pending_assigned_count,
'pending_level': level, 'pending_level': level,
'scheduled_count': scheduled_count, 'scheduled_count': scheduled_count,
'hosts_data': request.env['runbot.host'].search([('assigned_only', '=', False)]), 'hosts_data': request.env['runbot.host'].search([('assigned_only', '=', False)]),
@ -359,10 +361,11 @@ class Runbot(Controller):
def glances(self, project_id=None, **kwargs): def glances(self, project_id=None, **kwargs):
project_ids = [project_id] if project_id else request.env['runbot.project'].search([]).ids # search for access rights project_ids = [project_id] if project_id else request.env['runbot.project'].search([]).ids # search for access rights
bundles = request.env['runbot.bundle'].search([('sticky', '=', True), ('project_id', 'in', project_ids)]) bundles = request.env['runbot.bundle'].search([('sticky', '=', True), ('project_id', 'in', project_ids)])
pending = self._pending() pending_count, level, scheduled_count, pending_assigned_count = self._pending()
qctx = { qctx = {
'pending_total': pending[0], 'pending_count': pending_count,
'pending_level': pending[1], 'pending_assigned_count': pending_assigned_count,
'pending_level': level,
'bundles': bundles, 'bundles': bundles,
'title': 'Glances' 'title': 'Glances'
} }
@ -372,7 +375,7 @@ class Runbot(Controller):
'/runbot/monitoring/<int:category_id>', '/runbot/monitoring/<int:category_id>',
'/runbot/monitoring/<int:category_id>/<int:view_id>'], type='http', auth='user', website=True, sitemap=False) '/runbot/monitoring/<int:category_id>/<int:view_id>'], type='http', auth='user', website=True, sitemap=False)
def monitoring(self, category_id=None, view_id=None, **kwargs): def monitoring(self, category_id=None, view_id=None, **kwargs):
pending = self._pending() pending_count, level, scheduled_count, pending_assigned_count = self._pending()
hosts_data = request.env['runbot.host'].search([]) hosts_data = request.env['runbot.host'].search([])
if category_id: if category_id:
category = request.env['runbot.category'].browse(category_id) category = request.env['runbot.category'].browse(category_id)
@ -383,9 +386,10 @@ class Runbot(Controller):
bundles = request.env['runbot.bundle'].search([('sticky', '=', True)]) # NOTE we dont filter on project bundles = request.env['runbot.bundle'].search([('sticky', '=', True)]) # NOTE we dont filter on project
qctx = { qctx = {
'category': category, 'category': category,
'pending_total': pending[0], 'pending_count': pending_count,
'pending_level': pending[1], 'pending_assigned_count': pending_assigned_count,
'scheduled_count': pending[2], 'pending_level': level,
'scheduled_count': scheduled_count,
'bundles': bundles, 'bundles': bundles,
'hosts_data': hosts_data, 'hosts_data': hosts_data,
'auto_tags': request.env['runbot.build.error'].disabling_tags(), 'auto_tags': request.env['runbot.build.error'].disabling_tags(),
@ -578,10 +582,11 @@ class Runbot(Controller):
build_by_bundle = list(build_by_bundle.items()) build_by_bundle = list(build_by_bundle.items())
build_by_bundle.sort(key=lambda x: -len(x[1])) build_by_bundle.sort(key=lambda x: -len(x[1]))
pending_count, level, scheduled_count = self._pending() pending_count, level, scheduled_count, pending_assigned_count = self._pending()
context = { context = {
'build_by_bundle': build_by_bundle, 'build_by_bundle': build_by_bundle,
'pending_total': pending_count, 'pending_count': pending_count,
'pending_assigned_count': pending_assigned_count,
'pending_level': level, 'pending_level': level,
'scheduled_count': scheduled_count, 'scheduled_count': scheduled_count,
'hosts_data': request.env['runbot.host'].search([('assigned_only', '=', False)]), 'hosts_data': request.env['runbot.host'].search([('assigned_only', '=', False)]),

2
runbot/templates/dashboard.xml
View File

@ -14,7 +14,7 @@
<div> <div>
<span t-attf-class="badge badge-{{pending_level}}"> <span t-attf-class="badge badge-{{pending_level}}">
Pending: Pending:
<t t-esc="pending_total"/> <t t-esc="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-esc="pending_assigned_count"/>)</span>
</span> </span>
</div> </div>
<t t-set="project_id"/> <t t-set="project_id"/>

2
runbot/templates/utils.xml
View File

@ -168,7 +168,7 @@
<a href="/runbot/load_info" class="slots_infos"> <a href="/runbot/load_info" class="slots_infos">
<span t-attf-class="badge badge-{{pending_level}}"> <span t-attf-class="badge badge-{{pending_level}}">
Pending: Pending:
<t t-esc="pending_total"/> <t t-esc="pending_count"/><span title="Assigned build (reserved host)" t-if="pending_assigned_count">(<t t-esc="pending_assigned_count"/>)</span>
</span> </span>
<t t-set="testing" t-value="hosts_data._total_testing()"/> <t t-set="testing" t-value="hosts_data._total_testing()"/>
<t t-set="workers" t-value="hosts_data._total_workers()"/> <t t-set="workers" t-value="hosts_data._total_workers()"/>