nautilus: mgr/telemetry: fix device id splitting when anonymizing serial #37318
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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())
|
Conflicts: In master we use Python 3's f-string formatting to create The conflict happened since Nautilus still uses Python 2, and (added to the commit message) |
|
jenkins test api |
|
@yaarith Please don't add |
|
Sorry about that, @smithfarm, and thanks for the feedback. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backport tracker: https://tracker.ceph.com/issues/47193
backport of #36855
parent tracker: https://tracker.ceph.com/issues/46977