Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1641058: tasks that only exist because of another that is later optimized away should not be scheduled r=tomprince

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D81745
This commit is contained in:
Ben Hearsum 2020-07-02 17:00:03 +00:00
parent ea8a8a9f90
commit 2890d89ae8
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
taskcluster/taskgraph/generator.py
View File

@ -321,8 +321,8 @@ class TaskGraphGenerator(object):
always_target_tasks = set()
logger.info('Adding %d tasks with `always_target` attribute' % (
len(always_target_tasks) - len(always_target_tasks & target_tasks)))
target_graph = full_task_graph.graph.transitive_closure(
target_tasks | docker_image_tasks | always_target_tasks)
requested_tasks = target_tasks | docker_image_tasks | always_target_tasks
target_graph = full_task_graph.graph.transitive_closure(requested_tasks)
target_task_graph = TaskGraph(
{l: all_tasks[l] for l in target_graph.nodes},
target_graph)
@ -342,6 +342,7 @@ class TaskGraphGenerator(object):
optimized_task_graph, label_to_taskid = optimize_task_graph(
target_task_graph,
requested_tasks,
parameters,
do_not_optimize,
self._decision_task_id,

14
taskcluster/taskgraph/optimize/__init__.py
View File

@ -39,7 +39,7 @@ def register_strategy(name, args=()):
return wrap
def optimize_task_graph(target_task_graph, params, do_not_optimize,
def optimize_task_graph(target_task_graph, requested_tasks, params, do_not_optimize,
decision_task_id, existing_tasks=None, strategy_override=None):
"""
Perform task optimization, returning a taskgraph and a map from label to
@ -58,6 +58,7 @@ def optimize_task_graph(target_task_graph, params, do_not_optimize,
removed_tasks = remove_tasks(
target_task_graph=target_task_graph,
requested_tasks=requested_tasks,
optimizations=optimizations,
params=params,
do_not_optimize=do_not_optimize)
@ -102,7 +103,7 @@ def _log_optimization(verb, opt_counts):
logger.info('No tasks {} during optimization'.format(verb))
def remove_tasks(target_task_graph, params, optimizations, do_not_optimize):
def remove_tasks(target_task_graph, requested_tasks, params, optimizations, do_not_optimize):
"""
Implement the "Removing Tasks" phase, returning a set of task labels of all removed tasks.
"""
@ -124,6 +125,15 @@ def remove_tasks(target_task_graph, params, optimizations, do_not_optimize):
logger.debug(message.format(label=label, verb=verb, reason="dependent tasks"))
continue
# Some tasks in the task graph only exist because they were required
# by a task that has just been optimized away. They can now be removed.
if label not in requested_tasks:
reason = "downstreams-optimized"
verb = "removed"
removed.add(label)
opt_counts['downstreams-optimized'] += 1
logger.debug(message.format(label=label, verb=verb, reason=reason))
# call the optimization strategy
task = target_task_graph.tasks[label]
opt_by, opt, arg = optimizations(label)