openstack
/
cloudkitty
Code Issues Proposed changes

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
This commit is contained in:
Michal Arbet 2021-06-21 15:27:10 +02:00
parent 35ce237b76
commit 302f3c89ae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cloudkitty/collector/gnocchi.py
View File

@ -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))