diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-09-12 16:39:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-12 16:39:40 -0400 |
commit | 4ced3e42ea8d077210b22a72f6132f004ed6dfe3 (patch) | |
tree | cb84ccd00e788a02296126962125c949c0e5f688 /roles/openshift_health_checker/callback_plugins | |
parent | f8393b7aef78c92437fe78092821a8d0a11c22cc (diff) | |
parent | 5932c90c13dc415ab1448711961d398c51f97b8b (diff) | |
download | openshift-4ced3e42ea8d077210b22a72f6132f004ed6dfe3.tar.gz openshift-4ced3e42ea8d077210b22a72f6132f004ed6dfe3.tar.bz2 openshift-4ced3e42ea8d077210b22a72f6132f004ed6dfe3.tar.xz openshift-4ced3e42ea8d077210b22a72f6132f004ed6dfe3.zip |
Merge pull request #5352 from rhcarvalho/issue5311-harden-failure-summary-plugin
Skip failure dedup instead of crashing
Diffstat (limited to 'roles/openshift_health_checker/callback_plugins')
-rw-r--r-- | roles/openshift_health_checker/callback_plugins/zz_failure_summary.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/roles/openshift_health_checker/callback_plugins/zz_failure_summary.py b/roles/openshift_health_checker/callback_plugins/zz_failure_summary.py index 349655966..dcaf87eca 100644 --- a/roles/openshift_health_checker/callback_plugins/zz_failure_summary.py +++ b/roles/openshift_health_checker/callback_plugins/zz_failure_summary.py @@ -10,6 +10,7 @@ import traceback from ansible.plugins.callback import CallbackBase from ansible import constants as C from ansible.utils.color import stringc +from ansible.module_utils.six import string_types FAILED_NO_MSG = u'Failed without returning a message.' @@ -140,11 +141,19 @@ def deduplicate_failures(failures): Returns a new list of failures such that identical failures from different hosts are grouped together in a single entry. The relative order of failures is preserved. + + If failures is unhashable, the original list of failures is returned. """ groups = defaultdict(list) for failure in failures: group_key = tuple(sorted((key, value) for key, value in failure.items() if key != 'host')) - groups[group_key].append(failure) + try: + groups[group_key].append(failure) + except TypeError: + # abort and return original list of failures when failures has an + # unhashable type. + return failures + result = [] for failure in failures: group_key = tuple(sorted((key, value) for key, value in failure.items() if key != 'host')) @@ -159,7 +168,10 @@ def format_failure(failure): """Return a list of pretty-formatted text entries describing a failure, including relevant information about it. Expect that the list of text entries will be joined by a newline separator when output to the user.""" - host = u', '.join(failure['host']) + if isinstance(failure['host'], string_types): + host = failure['host'] + else: + host = u', '.join(failure['host']) play = failure['play'] task = failure['task'] msg = failure['msg'] |