mgr/telemetry: catch also IndexError in gather_device_report()

When generating the device report, we obfuscate host names, which exist in a device's 'location' key. Some devices do not have a 'location' key, thus we catch a KeyError in these cases; in other cases the key exists, but its value is an empty list. Skip these too by catching an IndexError. Fixes: https://tracker.ceph.com/issues/53603 Signed-off-by: Yaarit Hatuka <[email protected]>
thomasgoirand · Dec 16, 2021 · 6618104 · 6618104
1 parent 6a1e2cb
commit 6618104
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
@@ -613,7 +613,7 @@ def gather_device_report(self) -> Dict[str, Dict[str, Dict[str, str]]]:
             # anonymize host id
             try:
                 host = d['location'][0]['host']
-            except KeyError:
+            except (KeyError, IndexError):
                 continue
             anon_host = self.get_store('host-id/%s' % host)
             if not anon_host: