From 875cacdd46b4a7b70b3affb4e63effd01ac098cb Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Mon, 21 Jun 2021 15:27:10 +0200 Subject: [PATCH] Fix cloudkitty exception handling from gnocchiclient Probably due six removal, exception handling from gnocchiclient in cloudkitty is not working as expected. This patch fixing this issue. Bug described in storyboard: https://storyboard.openstack.org/#!/story/2008985 Story: 2008985 Task: 42635 Change-Id: I387fee79d277daa4c739297f1734dad1eaf4cc94 (cherry picked from commit 302f3c89aefeced6d5df41841b6ec146366d72c9) --- cloudkitty/collector/gnocchi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudkitty/collector/gnocchi.py b/cloudkitty/collector/gnocchi.py index 9260b580..7df254bf 100644 --- a/cloudkitty/collector/gnocchi.py +++ b/cloudkitty/collector/gnocchi.py @@ -319,7 +319,7 @@ class GnocchiCollector(collector.BaseCollector): # FIXME(peschk_l): gnocchiclient seems to be raising a BadRequest # when it should be raising MetricNotFound if isinstance(e, gexceptions.BadRequest): - if 'Metrics not found' not in e.args[0]: + if 'Metrics not found' not in e.message["cause"]: raise LOG.warning('[{scope}] Skipping this metric for the ' 'current cycle.'.format(scope=project_id, err=e))