Disk fixtures rework #330
Merged
Disk fixtures rework #330
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
ydirson
requested review from
glehmann,
stormi,
rushikeshjadhav,
Wescoeur and
Nambrok
ydirson
force-pushed
the
disks-rework
branch
6 times, most recently
from
ac95623 to
1f72326
Compare
|
Last push:
|
Nambrok
requested changes
Jun 20, 2025
ydirson
force-pushed
the
disks-rework
branch
4 times, most recently
from
0c6c08c to
6642deb
Compare
ydirson
force-pushed
the
disks-rework
branch
3 times, most recently
from
18ad9aa to
c1c6bfb
Compare
ydirson
commented
Jun 26, 2025
Wescoeur
reviewed
Jul 2, 2025
Nambrok
reviewed
Jul 4, 2025
glehmann
approved these changes
Aug 19, 2025
ydirson
force-pushed
the
disks-rework
branch
3 times, most recently
from
21fe576 to
12f840e
Compare
|
Last push squashes fixups from fixing issues discovered during CI runs. |
Nambrok
requested changes
Aug 26, 2025
| # Create and destroy tested in the same test to leave the host as unchanged as possible | ||
| sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk_4k}, verify=True) | ||
| sr_disk = unused_4k_disks[host][0]["name"] |
There was a problem hiding this comment.
We could have a function to get a device path from a BlockDeviceInfo since we do a lot for tests
There was a problem hiding this comment.
I'm not sure .name() brings a log over ["name"]
There was a problem hiding this comment.
I wasn't talking about only name but to get the device path too.
There was a problem hiding this comment.
Not sure I get what you mean, but that sounds like an improvement that can be done later?
Wescoeur
approved these changes
Aug 26, 2025
Those info typically don't change over the course of a test session, but Host.rescan_block_devices_info() is provided for when we'll have more sophisticated test cases. We use a custom TypedDict to be able to use this type more largely in upcoming commits. Reimplements disks() and available_disks() on top of this. Signed-off-by: Yann Dirson <[email protected]>
This method was not used since 7435c99 (largeblock: add tests largeblock driver + fixture), this repurposes it for a new life. Signed-off-by: Yann Dirson <[email protected]>
… pool Signed-off-by: Yann Dirson <[email protected]>
…_disk Signed-off-by: Yann Dirson <[email protected]>
Fills the role of --sr_disk, except that: - it is per-host - the default is "all disks", use empty device list to forbid all disks on a host Signed-off-by: Yann Dirson <[email protected]>
For some reason pyright would not consider the type known otherwise. Also use unquoted type hint, since we have deferred annotations and we use it that way in all other places. Signed-off-by: Yann Dirson <[email protected]>
…disk Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Only used for everything ZFS Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
Signed-off-by: Yann Dirson <[email protected]>
The old options had been missed and kept as no-op, which should not be a problem for any caller using "auto" (which was anyway the only sensible choice for a generic script). Signed-off-by: Yann Dirson <[email protected]>
Nambrok
approved these changes
Aug 28, 2025
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.
This replaces the existing disk fixtures, which rely on the assumption that we can take a dom0 device name on the pool master, and expect to find it across the whole pool with the same meaning. This was causing issues for GlusterFS and Linstor tests when some hosts in the test pool get their disk device names swapped after a reboot.
The old mechanism used a mandatory
--sr_diskflag to control the behavior of varioussr_disk*fixtures, with little code-sharing. The new one is based on a centraldisksfixture to properly introspect the pool's disks, which comes with its own--disksflag to filter which disks to expose to the tests, but by default exposes all of them. It then uses additional fixtures to filter disks using different criteria (for now: availability and blocksize of the disk), and then some pool-level fixtures allowing testing of distributed SR without risking to (try to) use the wrong disk.Builds on: