New fixture unused_4k_disks for largeblocks tests

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

conftest.py

@@ -122,6 +122,7 @@ def pytest_collection_modifyitems(items, config):
         'hostB1',
         'sr_disk_4k',
         'unused_disks',
+        'unused_4k_disks',
     ]
 
     for item in items:
@@ -386,6 +387,15 @@ def unused_disks(disks: dict[Host, list[DiskDevName]]
     logging.debug("available disks collected: %s", {host.hostname_or_ip: value for host, value in ret.items()})
     yield ret
 
+@pytest.fixture(scope='session')
+def unused_4k_disks(unused_disks: dict[Host, list[DiskDevName]]
+                    ) -> Generator[dict[Host, list[DiskDevName]]]:
+    ret = {host: [disk for disk in host_disks if host.disk_is_4k(disk)]
+           for host, host_disks in unused_disks.items()
+           }
+    logging.debug("available 4k disks collected: %s", {host.hostname_or_ip: value for host, value in ret.items()})
+    yield ret
+
 @pytest.fixture(scope='session')
 def sr_disk_4k(pytestconfig, host: Host) -> Generator[DiskDevName]:
     """

jobs.py

@@ -90,7 +90,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "(small_vm or no_vm) and not reboot and not quicktest and not sr_disk_4k",
+        "markers": "(small_vm or no_vm) and not reboot and not quicktest and not unused_4k_disks",
         "name_filter": "not migration and not linstor",
     },
     "storage-migrations": {
@@ -108,7 +108,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "not sr_disk_4k",
+        "markers": "not unused_4k_disks",
         "name_filter": "migration and not linstor",
     },
     "storage-reboots": {
@@ -125,7 +125,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "reboot and not flaky and not sr_disk_4k",
+        "markers": "reboot and not flaky and not unused_4k_disks",
         "name_filter": "not linstor",
     },
     "storage-quicktest": {
@@ -140,7 +140,7 @@
             "--sr-disk": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "quicktest and not sr_disk_4k",
+        "markers": "quicktest and not unused_4k_disks",
         "name_filter": "not linstor and not zfsvol",
     },
     "linstor-main": {
@@ -217,7 +217,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "(small_vm or no_vm) and sr_disk_4k and not reboot and not quicktest",
+        "markers": "(small_vm or no_vm) and unused_4k_disks and not reboot and not quicktest",
         "name_filter": "not migration",
     },
     "largeblock-migrations": {
@@ -234,7 +234,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "sr_disk_4k",
+        "markers": "unused_4k_disks",
         "name_filter": "migration",
     },
     "largeblock-reboots": {
@@ -250,7 +250,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "sr_disk_4k and reboot",
+        "markers": "unused_4k_disks and reboot",
     },
     "largeblock-quicktest": {
         "description": "runs `quicktest` on the largeblock storage driver",
@@ -263,7 +263,7 @@
             "--sr-disk-4k": "auto",
         },
         "paths": ["tests/storage"],
-        "markers": "sr_disk_4k and quicktest",
+        "markers": "unused_4k_disks and quicktest",
     },
     "sb-main": {
         "description": "tests uefistored/varstored and SecureBoot using a small unix VM (or no VM when none needed)",

lib/host.py

@@ -556,6 +556,20 @@ def disk_is_available(self, disk: DiskDevName) -> bool:
         """
         return len(self.ssh(['lsblk', '--noheadings', '--nodeps', '-o', 'MOUNTPOINT', '/dev/' + disk]).strip()) == 0
 
+    def disk_is_4k(self, disk: DiskDevName) -> bool:
+        """
+        Check if a disk has 4k blocks.
+
+        It may or may not contain identifiable filesystem or partition label.
+        If there are no mountpoints, it is assumed that the disk is not in use.
+
+        Warn: This function may misclassify LVM_member disks (e.g. in XOSTOR, RAID, ZFS) as "available".
+        Such disks may not have mountpoints but still be in use.
+        """
+        return self.ssh(['lsblk', '--noheadings', '--nodeps',
+                         '-o', 'LOG-SEC',
+                         '/dev/' + disk]).strip() == '4096'
+
     def available_disks(self, blocksize: int = 512) -> list[DiskDevName]:
         """
         Return a list of available disks for formatting, creating SRs or such.

pytest.ini

@@ -11,6 +11,7 @@ markers =
     hostB1: a second pool.
     sr_disk_4k: the test needs a free 4KiB block device that it can erase.
     unused_disks: the test needs a free disk or writable block device that it can erase.
+    unused_4k_disks: the test needs a free 4KiB block device that it can erase.
 
     # * VM-related markers, automatically set based on fixtures
     no_vm: tests that do not require a VM to run.

tests/storage/largeblock/conftest.py

@@ -2,9 +2,10 @@
 import pytest
 
 @pytest.fixture(scope='package')
-def largeblock_sr(host, sr_disk_4k):
+def largeblock_sr(host, unused_4k_disks):
     """ A LARGEBLOCK SR on first host. """
-    sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk_4k})
+    sr_disk = unused_4k_disks[host][0]
+    sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk})
     yield sr
     # teardown
     sr.destroy()

tests/storage/largeblock/test_largeblock_sr.py

@@ -15,9 +15,10 @@ class TestLARGEBLOCKSRCreateDestroy:
     def test_create_sr_with_missing_device(self, host):
         try_to_create_sr_with_missing_device('largeblock', 'LARGEBLOCK-local-SR-test', host)
 
-    def test_create_and_destroy_sr(self, host, sr_disk_4k):
+    def test_create_and_destroy_sr(self, host, unused_4k_disks):
         # 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]
+        sr = host.sr_create('largeblock', "LARGEBLOCK-local-SR-test", {'device': '/dev/' + sr_disk}, verify=True)
         # import a VM in order to detect vm import issues here rather than in the vm_on_xfs_fixture used in
         # the next tests, because errors in fixtures break teardown
         vm = host.import_vm(vm_image('mini-linux-x86_64-bios'), sr_uuid=sr.uuid)