Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-237-Support-for-resuming-failed-workflow-executions 79dc7e75e -> 8617ae1a5
review 2 fixups Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/8617ae1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/8617ae1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/8617ae1a Branch: refs/heads/ARIA-237-Support-for-resuming-failed-workflow-executions Commit: 8617ae1a576ade6132d64b5e01fdd34ae0ed0696 Parents: 79dc7e7 Author: max-orlov <[email protected]> Authored: Tue Jul 11 17:31:44 2017 +0300 Committer: max-orlov <[email protected]> Committed: Tue Jul 11 17:33:09 2017 +0300 ---------------------------------------------------------------------- aria/cli/commands/executions.py | 9 +++------ aria/cli/core/aria.py | 6 ++++++ aria/cli/helptexts.py | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8617ae1a/aria/cli/commands/executions.py ---------------------------------------------------------------------- diff --git a/aria/cli/commands/executions.py b/aria/cli/commands/executions.py index ea70af5..feeef20 100644 --- a/aria/cli/commands/executions.py +++ b/aria/cli/commands/executions.py @@ -159,8 +159,7 @@ def start(workflow_name, @aria.argument('execution-id') @aria.options.inputs(help=helptexts.EXECUTION_INPUTS) @aria.options.dry_execution [email protected]_max_attempts() [email protected]_retry_interval() [email protected]_failed_tasks @aria.options.mark_pattern() @aria.options.verbose() @aria.pass_model_storage @@ -168,9 +167,8 @@ def start(workflow_name, @aria.pass_plugin_manager @aria.pass_logger def resume(execution_id, + retry_failed_tasks, dry, - task_max_attempts, - task_retry_interval, mark_pattern, model_storage, resource_storage, @@ -194,8 +192,7 @@ def resume(execution_id, workflow_runner = \ WorkflowRunner( model_storage, resource_storage, plugin_manager, - execution_id=execution_id, executor=executor, - task_max_attempts=task_max_attempts, task_retry_interval=task_retry_interval + execution_id=execution_id, retry_failed_tasks=retry_failed_tasks, executor=executor, ) logger.info('Resuming {0}execution. Press Ctrl+C cancel'.format('dry ' if dry else '')) http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8617ae1a/aria/cli/core/aria.py ---------------------------------------------------------------------- diff --git a/aria/cli/core/aria.py b/aria/cli/core/aria.py index 515c06a..b84507c 100644 --- a/aria/cli/core/aria.py +++ b/aria/cli/core/aria.py @@ -310,6 +310,12 @@ class Options(object): is_flag=True, help=helptexts.DRY_EXECUTION) + self.retry_failed_tasks = click.option( + '--retry-failed-tasks', + is_flag=True, + help=helptexts.RETRY_FAILED_TASK + ) + self.reset_config = click.option( '--reset-config', is_flag=True, http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/8617ae1a/aria/cli/helptexts.py ---------------------------------------------------------------------- diff --git a/aria/cli/helptexts.py b/aria/cli/helptexts.py index a5d41e8..f6e0a96 100644 --- a/aria/cli/helptexts.py +++ b/aria/cli/helptexts.py @@ -46,6 +46,7 @@ TASK_MAX_ATTEMPTS = \ "How many times should a task be attempted in case of failures [default: {0}]" DRY_EXECUTION = "Execute a workflow dry run (prints operations information without causing side " \ "effects)" +RETRY_FAILED_TASK = "Retry failed tasks" IGNORE_AVAILABLE_NODES = "Delete the service even if it has available nodes" SORT_BY = "Key for sorting the list" DESCENDING = "Sort list in descending order [default: False]"
