Commits on Sep 22, 2020

1. mgr/telemetry: fix device id splitting when anonymizing serial …

   Anonymizing the serial number in the device id string fails in rare
   cases where 'vendor' and 'model' are missing from the device id
   string. Ideally, device id is generated (in blkdev.cc) as
   'vendor_model_serial', in case all fields were successfully retrieved
   from the device. In cases where they were not, device id can also be
   generated as 'model_serial' or 'serial'. Splitting by '_' fails in the
   latter case (since 'serial' is the only element in the string).
   
   In order to anonymize serial numbers in smartctl reports we now rely
   on the serial number value as retrieved from the raw smartctl report
   itself (as opposed to the one in device id). That's in order to avoid
   possible inconsistencies between the serial retrieved from device id and
   the one in the report.
   
   Fixes: https://tracker.ceph.com/issues/46977
   Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
   (cherry picked from commit e5099a7)
   
   Conflicts:
   	src/pybind/mgr/telemetry/module.py
   
   In master we use Python 3's f-string formatting to create 'anon_devid':
   	anon_devid = f"{devid.rsplit('_', 1)[0]}_{uuid.uuid1()}"
   
   The conflict happened since Nautilus still uses Python 2, and 'anon_id'
   is created via string concatenation.
   	anon_devid = devid[:devid.rfind('_')] + '_' + str(uuid.uuid1())

   

   yaarith committed Sep 22, 2020
   Configuration menu

   • View commit details
   • Copy full SHA for 0dccfc4
   • Browse repository at this point

   Copy the full SHA

   0dccfc4 View commit details

   Browse the repository at this point in the history