fix: Get same sector size disks for multi device LVM tests

library/find_unused_disk.py

@@ -39,6 +39,11 @@
         description: Specifies which disk interface will be accepted (scsi, virtio, nvme).
         default: null
         type: str
+
+    match_sector_size:
+        description: Specifies whether all returned disks must have the same (logical) sector size.
+        default: false
+        type: bool
 '''
 
 EXAMPLES = '''
@@ -138,45 +143,30 @@ def get_partitions(disk_path):
 
 
 def get_disks(module):
-    buf = module.run_command(["lsblk", "-p", "--pairs", "--bytes", "-o", "NAME,TYPE,SIZE,FSTYPE"])[1]
+    buf = module.run_command(["lsblk", "-p", "--pairs", "--bytes", "-o", "NAME,TYPE,SIZE,FSTYPE,LOG-SEC"])[1]
     disks = dict()
     for line in buf.splitlines():
         if not line:
             continue
 
-        m = re.search(r'NAME="(?P<path>[^"]*)" TYPE="(?P<type>[^"]*)" SIZE="(?P<size>\d+)" FSTYPE="(?P<fstype>[^"]*)"', line)
+        m = re.search(r'NAME="(?P<path>[^"]*)" TYPE="(?P<type>[^"]*)" SIZE="(?P<size>\d+)" FSTYPE="(?P<fstype>[^"]*)" LOG-SEC="(?P<ssize>\d+)"', line)
         if m is None:
             module.log(line)
             continue
 
         if m.group('type') != "disk":
             continue
 
-        disks[m.group('path')] = {"type": m.group('type'), "size": m.group('size'), "fstype": m.group('fstype')}
+        disks[m.group('path')] = {"type": m.group('type'), "size": m.group('size'),
+                                  "fstype": m.group('fstype'), "ssize": m.group('ssize')}
 
     return disks
 
 
-def run_module():
-    """Create the module"""
-    module_args = dict(
-        max_return=dict(type='int', required=False, default=10),
-        min_size=dict(type='str', required=False, default='0'),
-        max_size=dict(type='str', required=False, default='0'),
-        with_interface=dict(type='str', required=False, default=None)
-    )
-
-    result = dict(
-        changed=False,
-        disks=[]
-    )
-
-    module = AnsibleModule(
-        argument_spec=module_args,
-        supports_check_mode=True
-    )
-
+def filter_disks(module):
+    disks = {}
     max_size = Size(module.params['max_size'])
+
     for path, attrs in get_disks(module).items():
         if is_ignored(path):
             continue
@@ -204,14 +194,49 @@ def run_module():
         if not can_open(path):
             continue
 
-        result['disks'].append(os.path.basename(path))
-        if len(result['disks']) >= module.params['max_return']:
-            break
+        disks[path] = attrs
+
+    return disks
+
+
+def run_module():
+    """Create the module"""
+    module_args = dict(
+        max_return=dict(type='int', required=False, default=10),
+        min_size=dict(type='str', required=False, default='0'),
+        max_size=dict(type='str', required=False, default='0'),
+        with_interface=dict(type='str', required=False, default=None),
+        match_sector_size=dict(type='bool', required=False, default=False)
+    )
+
+    result = dict(
+        changed=False,
+        disks=[]
+    )
+
+    module = AnsibleModule(
+        argument_spec=module_args,
+        supports_check_mode=True
+    )
+
+    disks = filter_disks(module)
+
+    if module.params['match_sector_size']:
+        # pick the most disks with the same sector size
+        sector_sizes = dict()
+        for path, ss in [(path, disks[path]["ssize"]) for path in disks.keys()]:
+            if ss in sector_sizes.keys():
+                sector_sizes[ss].append(path)
+            else:
+                sector_sizes[ss] = [path]
+        disks = [os.path.basename(p) for p in max(sector_sizes.values(), key=len)]
+    else:
+        disks = [os.path.basename(p) for p in disks.keys()]
 
-    if not result['disks']:
+    if not disks:
         result['disks'] = "Unable to find unused disk"
     else:
-        result['disks'].sort()
+        result['disks'] = sorted(disks)[:int(module.params['max_return'])]
 
     module.exit_json(**result)
 

tests/get_unused_disk.yml

@@ -19,6 +19,7 @@
     max_size: "{{ max_size | d(omit) }}"
     max_return: "{{ max_return | d(omit) }}"
     with_interface: "{{ storage_test_use_interface | d(omit) }}"
+    match_sector_size: "{{ match_sector_size | d(omit) }}"
   register: unused_disks_return
 
 - name: Set unused_disks if necessary

tests/tests_change_fs_use_partitions.yml

@@ -31,7 +31,7 @@
       include_tasks: get_unused_disk.yml
       vars:
         min_size: "{{ volume_size }}"
-        max_return: 2
+        max_return: 1
 
     - name: Create an LVM partition with the default file system type
       include_role:

tests/tests_create_lvm_cache_then_remove.yml

@@ -57,6 +57,7 @@
         min_size: "{{ volume_group_size }}"
         max_return: 2
         disks_needed: 2
+        match_sector_size: true
 
     - name: Create a cached LVM logical volume under volume group 'foo'
       include_role:

tests/tests_create_thinp_then_remove.yml

@@ -23,6 +23,7 @@
       include_tasks: get_unused_disk.yml
       vars:
         max_return: 3
+        match_sector_size: true
 
     - name: Create a thinpool device
       include_role:

tests/tests_fatals_cache_volume.yml

@@ -29,6 +29,7 @@
       vars:
         max_return: 2
         disks_needed: 2
+        match_sector_size: true
 
     - name: Verify that creating a cached partition volume fails
       include_tasks: verify-role-failed.yml

tests/tests_lvm_multiple_disks_multiple_volumes.yml

@@ -29,6 +29,7 @@
         min_size: "{{ volume_group_size }}"
         max_return: 2
         disks_needed: 2
+        match_sector_size: true
 
     - name: >-
         Create a logical volume spanning two physical volumes that changes its

tests/tests_lvm_pool_members.yml

@@ -59,6 +59,7 @@
           vars:
             min_size: "{{ volume_group_size }}"
             disks_needed: 3
+            match_sector_size: true
 
         - name: Create volume group 'foo' with 3 PVs
           include_role:

tests/unit/test_unused_disk.py

@@ -10,9 +10,9 @@
 blkid_data_pttype = [('/dev/sdx', '/dev/sdx: PTTYPE=\"dos\"'),
                      ('/dev/sdy', '/dev/sdy: PTTYPE=\"test\"')]
 
-blkid_data = [('/dev/sdx', 'UUID=\"hello-1234-56789\" TYPE=\"crypto_LUKS\"'),
-              ('/dev/sdy', 'UUID=\"this-1s-a-t3st-f0r-ansible\" VERSION=\"LVM2 001\" TYPE=\"LVM2_member\" USAGE=\"raid\"'),
-              ('/dev/sdz', 'LABEL=\"/data\" UUID=\"a12bcdef-345g-67h8-90i1-234j56789k10\" VERSION=\"1.0\" TYPE=\"ext4\" USAGE=\"filesystem\"')]
+blkid_data = [('/dev/sdx', 'UUID=\"hello-1234-56789\" TYPE=\"crypto_LUKS\" LOG-SEC=\"512\"'),
+              ('/dev/sdy', 'UUID=\"this-1s-a-t3st-f0r-ansible\" VERSION=\"LVM2 001\" TYPE=\"LVM2_member\" USAGE=\"raid\" LOG-SEC=\"512\"'),
+              ('/dev/sdz', 'LABEL=\"/data\" UUID=\"a12bcdef-345g-67h8-90i1-234j56789k10\" VERSION=\"1.0\" TYPE=\"ext4\" USAGE=\"filesystem\" LOG-SEC=\"512\"')]
 
 holders_data_none = [('/dev/sdx', ''),
                      ('/dev/dm-99', '')]