Modernise scan_disks() - no functional change intended #2826 #2827
Conversation
This file contains hidden or 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
Includes: - Modernisation re type hints in scan_disks(). - Improve lsblk line parser via modern Python builtins. Replace by-hand lsblk output line parser with dictionary comprehension. - Programmatically establish `lsblk` field derived Disk namedtuple fields. - Refactoring for readability. - Black reformatting. - Employ defaults in Disk named tuple to ease creation using lsblk info, as these defaults pertain to our extra flag info. - Normalise scan_disks()'s working dict keys to lowercase. By normalising on lowercase we can ease the transition to using our Disk named tuple as the working copy: to help readability and highlight where we write (via Disk.replace(root=True)). This should also simplify the assembly of our final return value. We also have a large number of tests that use the existing lowercase Disk fields. By working directly with the Disk namedtuple during device collation, we gain readability and the advantages of an immutable type: i.e. we are then more explicit where writes/changes happen due to requirement to use Disk._replace(). We also require less type transitions overall.
TestingAn rpm was successfully build with these changes, ensuring all existing tests passed. The resulting Rockstor instance worked as expected regarding disk presentation. And two example pools were successfully imported and interpreted. N.B. this PR is a stepping stone to contain/present the interim no function change intended improvements as per the linked issue text. |
|
@FroggyFlox & @Hooverdan96 Merging as a dependency / prerequisite to my ongoing work towards:
As per linked issue text. This should then help with future assessments/understanding of why some changes were made to this rather sensitive and low-level piece of our puzzle. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
By working directly with the Disk namedtuple during device collation, we gain readability and the advantages of an immutable type: i.e. we are then more explicit where writes/changes happen due to the requirement to use Disk._replace(). We also require less type transitions overall.
Includes:
Replaces by-hand lsblk output line parser with dictionary comprehension.
Programmatically establishing
lsblkfield derived Disk namedtuple fields.Fixes #2826