Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations 57cc88867 -> bfbd86fa2
wip... Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/bfbd86fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/bfbd86fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/bfbd86fa Branch: refs/heads/ARIA-214-Dry-execution-changes-the-state-of-non-implemented-operations Commit: bfbd86fa23dbb1830cb0dc7751fd3df4332f143f Parents: 57cc888 Author: max-orlov <[email protected]> Authored: Sun May 7 18:51:09 2017 +0300 Committer: max-orlov <[email protected]> Committed: Sun May 7 18:51:09 2017 +0300 ---------------------------------------------------------------------- aria/orchestrator/workflows/executor/base.py | 9 +++------ aria/orchestrator/workflows/executor/celery.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bfbd86fa/aria/orchestrator/workflows/executor/base.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflows/executor/base.py b/aria/orchestrator/workflows/executor/base.py index 7c18586..e55c736 100644 --- a/aria/orchestrator/workflows/executor/base.py +++ b/aria/orchestrator/workflows/executor/base.py @@ -33,15 +33,12 @@ class BaseExecutor(logger.LoggerMixin): Execute a task :param task: task to execute """ - if hasattr(task, 'model_task') and task.model_task.implementation: - self._execute_empty_task(task) + if getattr(task, 'model_task') and task.model_task.implementation: + self._task_started(task) + self._task_succeeded(task) else: self._execute(task) - def _execute_empty_task(self, task): - self._task_started(task) - self._task_succeeded(task) - def close(self): """ Close the executor http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/bfbd86fa/aria/orchestrator/workflows/executor/celery.py ---------------------------------------------------------------------- diff --git a/aria/orchestrator/workflows/executor/celery.py b/aria/orchestrator/workflows/executor/celery.py index 7bd9b7c..bbddc25 100644 --- a/aria/orchestrator/workflows/executor/celery.py +++ b/aria/orchestrator/workflows/executor/celery.py @@ -42,7 +42,7 @@ class CeleryExecutor(BaseExecutor): self._receiver_thread.start() self._started_queue.get(timeout=30) - def execute(self, task): + def _execute(self, task): self._tasks[task.id] = task inputs = dict(inp.unwrap() for inp in task.inputs.values()) inputs['ctx'] = task.context
