openstack/mistral
Code Issues Proposed changes

Merge "Optimize searching of upstream task executions"

Browse Source
This commit is contained in:
Zuul 2019-05-22 07:08:31 +00:00 committed by Gerrit Code Review
commit fefdcd77cd
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mistral/workflow/base.py
View File

@ -20,6 +20,7 @@ import abc
from oslo_log import log as logging from oslo_log import log as logging
from osprofiler import profiler from osprofiler import profiler
from mistral.db.v2 import api as db_api
from mistral import exceptions as exc from mistral import exceptions as exc
from mistral.lang import parser as spec_parser from mistral.lang import parser as spec_parser
from mistral import utils as u from mistral import utils as u
@ -263,3 +264,10 @@ class WorkflowController(object):
def _is_paused_or_completed(self): def _is_paused_or_completed(self):
return states.is_paused_or_completed(self.wf_ex.state) return states.is_paused_or_completed(self.wf_ex.state)
def _get_task_executions(self, **kwargs):
return db_api.get_task_executions(
workflow_execution_id=self.wf_ex.id,
sort_keys=[], # disable sorting
**kwargs
)

19
mistral/workflow/direct_workflow.py
View File

@ -45,15 +45,12 @@ class DirectWorkflowController(base.WorkflowController):
__workflow_type__ = "direct" __workflow_type__ = "direct"
def _get_upstream_task_executions(self, task_spec): def _get_upstream_task_executions(self, task_spec):
return list( t_specs_names = [t_spec.get_name() for t_spec in
filter( self.wf_spec.find_inbound_task_specs(task_spec)]
lambda t_e: self._is_upstream_task_execution(task_spec, t_e), t_execs = self._get_task_executions(name={'in': t_specs_names})
lookup_utils.find_task_executions_by_specs(
self.wf_ex.id, return [t_ex for t_ex in t_execs
self.wf_spec.find_inbound_task_specs(task_spec) if self._is_upstream_task_execution(task_spec, t_ex)]
)
)
)
def _is_upstream_task_execution(self, t_spec, t_ex_candidate): def _is_upstream_task_execution(self, t_spec, t_ex_candidate):
if not states.is_completed(t_ex_candidate.state): if not states.is_completed(t_ex_candidate.state):
@ -366,10 +363,8 @@ class DirectWorkflowController(base.WorkflowController):
names = self._find_all_parent_task_names(task_spec) names = self._find_all_parent_task_names(task_spec)
t_execs_cache = { t_execs_cache = {
t_ex.name: t_ex for t_ex in db_api.get_task_executions( t_ex.name: t_ex for t_ex in self._get_task_executions(
fields=('id', 'name', 'state'), fields=('id', 'name', 'state'),
sort_keys=[],
workflow_execution_id=self.wf_ex.id,
name={'in': names} name={'in': names}
) )
} if names else {} # don't perform a db request if 'names' are empty } if names else {} # don't perform a db request if 'names' are empty

17
mistral/workflow/reverse_workflow.py
View File

@ -83,21 +83,10 @@ class ReverseWorkflowController(base.WorkflowController):
return task_spec return task_spec
def _get_upstream_task_executions(self, task_spec): def _get_upstream_task_executions(self, task_spec):
t_specs = [ t_specs_names = self.wf_spec.get_task_requires(task_spec) or []
self.wf_spec.get_tasks()[t_name] t_execs = self._get_task_executions(name={'in': t_specs_names})
for t_name in self.wf_spec.get_task_requires(task_spec)
or []
]
return list( return [t_ex for t_ex in t_execs if t_ex.state == states.SUCCESS]
filter(
lambda t_e: t_e.state == states.SUCCESS,
lookup_utils.find_task_executions_by_specs(
self.wf_ex.id,
t_specs
)
)
)
def evaluate_workflow_final_context(self): def evaluate_workflow_final_context(self):
task_execs = lookup_utils.find_task_executions_by_spec( task_execs = lookup_utils.find_task_executions_by_spec(