From: Dan Mick <dan.mick@redhat.com>
Date: Thu, 10 Oct 2019 22:18:51 +0000 (-0700)
Subject: mgr/telemetry: dict.pop() errs on nonexistent key
X-Git-Tag: v15.1.0~1281^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=19028f0d9da8c010700b7f0bfced3de0423a1682;p=ceph.git

mgr/telemetry: dict.pop() errs on nonexistent key

I suggested this in a review, but failed to correctly understand
what happens when the key doesn't exist.  Test for it.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 6065a52cbb80..e730903ea9fe 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -336,7 +336,8 @@ class Module(MgrModule):
 
             # anonymize the smartctl report itself
             for k in ['serial_number']:
-                m.pop(k)
+                if k in m:
+                    m.pop(k)
 
             res[anon_devid] = m
         return res