From c31faaa2862401c07825af46b08f99647db7ee63 Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Wed, 24 Jul 2019 00:34:26 +0000 Subject: [PATCH] wait_for_introspection_to_finish_error set status FAILED Currently when wait_for_introspection_to_finish_error is reached, the _introspect workflow will pass as a success even when it actually failed. This means that the retry logic in the calling workflow is never triggered. wait_for_introspection_to_finish_error is hit in downstream CI when ironic-introspector is under too much load to respond to status poll requests. This change also ensures callers to the tripleo.baremetal.v1.introspect can override the default concurrency so that this can be changed when required. Change-Id: Ifd88ff9175bc6ca583e3826c59787680e25fbea3 Partial-Bug: #1836976 --- workbooks/baremetal.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/workbooks/baremetal.yaml b/workbooks/baremetal.yaml index f0c983a31..f305ed9a2 100644 --- a/workbooks/baremetal.yaml +++ b/workbooks/baremetal.yaml @@ -498,9 +498,10 @@ workflows: on-success: send_message wait_for_introspection_to_finish_error: - publish: - message: <% "Introspection of node {0} timed out.".format($.node_uuid) %> on-success: send_message + publish: + status: FAILED + message: <% "Introspection of node {0} failed.".format($.node_uuid) %> send_message: workflow: tripleo.messaging.v1.send @@ -646,6 +647,7 @@ workflows: input: - run_validations: False - queue_name: tripleo + - concurrency: 20 tags: - tripleo-common-managed @@ -684,6 +686,7 @@ workflows: node_uuids: <% $.managed_nodes %> run_validations: <% $.run_validations %> queue_name: <% $.queue_name %> + concurrency: <% $.concurrency %> publish: introspected_nodes: <% task().result.introspected_nodes %>