Merge ~bladernr/plainbox-provider-checkbox:1467520-disk-tests-mapper-devs into plainbox-provider-checkbox:master

[Jeff Lane ]

Modified disk_stress_ng to work with devmapper devices.

Tested with xenial and zesty on Power8

[Paul Larson (pwlars)]

A couple of minor comments, and a question. Does this really make sense for selecting a disk to run a destructive test on? Would it be better to either 1. insist that we have a configured value for the disk we can use for this, or 2. Look for the largest *unmounted" partition that is also not part of a mounted logical volume that is mounted?

I see this is a pretty critical bug though, so if you can address these things, great. But they are not worth blocking on if you need to land this and it's well tested. I don't think I have a way to really test it myself, but I saw that you had commented on the tests done with it.

review: Approve

[Jeff Lane  (bladernr)]

Made some changes

review: Needs Resubmitting

[Paul Larson (pwlars)]

Looks good, +1

review: Approve

diff --git a/bin/disk_stress_ng b/bin/disk_stress_ng
index de96f46..0b5de83 100755
--- a/bin/disk_stress_ng
+++ b/bin/disk_stress_ng
@@ -101,21 +101,36 @@ find_largest_lv() {
 find_largest_partition() {
     largest_part=""
     largest_size=0
-    partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep part | tr -s " ")
+    mapper_string="dm-"
+    if [ "${disk_device#*$mapper_string}" = "$disk_device" ]; then
+        partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep part | tr -s " ")
+    else
+        partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device)
+    fi
     unsupported_fs=""
     for partition in $(echo "$partitions" | cut -d " " -f 1) ; do
-        part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 2)
-        local blkid_info=$(blkid -s TYPE /dev/$partition | grep -E ext2\|ext3\|ext4\|xfs\|jfs\|btrfs\|LVM2_member)
-        if [ "$part_size" -gt "$largest_size" ] && [ -n "$blkid_info" ]  ; then
+        if [ -b "/dev/$partition" ]; then
+            part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 2)
+            part_location="/dev/$partition"
+        elif [ -b "/dev/mapper/$partition" ]; then
+            part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 3)
+            part_location="/dev/mapper/$partition"
+        else
+            echo "$partition not found!"
+            echo "Aborting test"
+            exit 1
+        fi
+        local blkid_info=$(blkid -s TYPE $part_location | grep -E ext2\|ext3\|ext4\|xfs\|jfs\|btrfs\|LVM2_member)
+        if [ "$part_size" > "$largest_size" ] && [ -n "$blkid_info" ]  ; then
             if [[ "$blkid_info" =~ .*LVM2_member.* ]] ; then
                 find_largest_lv
             else
                 largest_size=$part_size
-                largest_part="/dev/$partition"
-                largest_fs=$(blkid -s TYPE "/dev/$partition" | cut -d "=" -f 2)
+                largest_part="$part_location"
+                largest_fs=$(blkid -s TYPE "$part_location" | cut -d "=" -f 2)
             fi
         fi
-        local blkid_info=$(blkid -s TYPE /dev/$partition | grep -E ntfs\|vfat\|hfs)
+        local blkid_info=$(blkid -s TYPE $part_location | grep -E ntfs\|vfat\|hfs)
         if [ -n "$blkid_info" ]  ; then
             # If there's an NTFS, HFS+, or FAT filesystem on the disk make note of it....
             unsupported_fs=$(blkid -s TYPE "/dev/$partition" | cut -d "=" -f 2)
diff --git a/bin/storage_test b/bin/storage_test
index 1aed0da..5f7516b 100755
--- a/bin/storage_test
+++ b/bin/storage_test
@@ -30,6 +30,35 @@ function run_bonnie() {
     fi
 }
 
+# Find the largest logical volume in an LVM partition.
+# Output:
+#   $largest_part -- Device filename of largest qualifying partition
+#   $largest_size -- Size of largest qualifying partition
+#   $largest_fs -- Filesystem (ext4, etc.) used on largest qualifying partition
+# Note: Above variables are initialized in find_largest_partition(), which
+# calls this function.
+# Caveat: If LVM is used, there can be no guarantee that a specific disk
+# device is actually being tested. Thus, an LVM configuration should span
+# just one disk device. LVM may be used on one disk, but subsequent disks
+# should use "raw" partitions.
+find_largest_lv() {
+    local partonly=$(echo $partition | cut -f 3 -d "/")
+        for syslv in $(ls -d /sys/block/dm-*/slaves/$partonly) ; do
+            lv=$(echo "$syslv" | cut -f 4 -d "/")
+            size=$(cat /sys/block/$lv/size)
+            sector_size=$(cat /sys/block/$lv/queue/hw_sector_size)
+            let size=$size*$sector_size
+            local blkid_info=$(blkid -s TYPE /dev/$lv | grep -E ext2\|ext3\|ext4\|xfs\|jfs\|btrfs)
+            if [ "$size" -gt "$largest_size" ] && [ -n "$blkid_info" ] ; then
+                local blkid_info=$(blkid -s TYPE /dev/$lv)
+                largest_size=$size
+                largest_part="/dev/$lv"
+                largest_fs=$(blkid -s TYPE "/dev/$lv" | cut -d "=" -f 2)
+            fi
+        done
+} # find_largest_lv()
+
+
 # Find the largest partition that holds a supported filesystem on $disk_device.
 # This code is adapted from a similar function in `disk_stress_ng`.
 # Output:
@@ -40,25 +69,51 @@ function run_bonnie() {
 find_largest_partition() {
     largest_part=""
     largest_size=0
-    partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk | grep part | tr -s " ")
+    mapper_string="dm-"
+    if [ "${disk_device#*$mapper_string}" = "$disk_device" ]; then
+        partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device | grep part | tr -s " ")
+    else
+        partitions=$(lsblk -b -l -n -o NAME,SIZE,TYPE,MOUNTPOINT $disk_device)
+    fi
     unsupported_fs=""
     for partition in $(echo "$partitions" | cut -d " " -f 1) ; do
         part_size=$(echo "$partitions" | grep "$partition " | cut -d " " -f 2)
-        local blkid_info=$(blkid -s TYPE /dev/$partition | grep -E ext2\|ext3\|ext4\|xfs\|jfs\|btrfs)
-        if [ "$part_size" -gt "$largest_size" ] && [ -n "$blkid_info" ]  ; then
-            largest_size=$part_size
-            largest_part="/dev/$partition"
-            largest_fs=$(blkid -s TYPE "/dev/$partition" | cut -d "=" -f 2)
+        if [ -b "/dev/$partition" ]; then
+            part_location="/dev/$partition"
+        elif [ -b "/dev/mapper/$partition" ]; then
+            part_location="/dev/mapper/$partition"
+        else
+            echo "$partition not found!"
+            echo "Aborting test"
+            exit 1
         fi
-        local blkid_info=$(blkid -s TYPE /dev/$partition | grep -E ntfs\|vfat\|hfs)
-        if [ -n "$blkid_info" ]  ; then
-            # If there's an NTFS, HFS+, or FAT filesystem on the disk make note of it....
-            unsupported_fs=$(blkid -s TYPE "/dev/$partition" | cut -d "=" -f 2)
+        local blkid_info=$(blkid -s TYPE $part_location | grep -E ext2\|ext3\|ext4\|xfs\|jfs\|btrfs\|LVM2_member)
+        if [ "$part_size" > "$largest_size" ] && [ -n "$blkid_info" ]  ; then
+            if [[ "$blkid_info" =~ .*LVM2_member.* ]] ; then
+                find_largest_lv
+            else
+                largest_size=$part_size
+                largest_part="$part_location"
+                largest_fs=$(blkid -s TYPE "$part_location" | cut -d "=" -f 2)
+            fi
         fi
-    done
+        local blkid_info=$(blkid -s TYPE $part_location | grep -E ntfs\|vfat\|hfs)
+	if [ -n "$blkid_info" ]  ; then
+	    # If there's an NTFS, HFS+, or FAT filesystem on the disk make note of it....
+	    unsupported_fs=$(blkid -s TYPE "/dev/$partition" | cut -d "=" -f 2)
+	fi
+     done
 } # find_largest_partition()
 
-disk=/dev/$1
+
+if [[ "$1}" =~ dm-.* ]]; then
+    # assume lvm or multipath and look for the dev/mapper device
+    disk=/dev/mapper/`ls -l /dev/mapper/ | grep $1 | awk '{print $9}'`
+else
+    # if the disk doesn't look like dm-0
+    disk=/dev/$1
+fi
+echo "Set disk to $disk"
 scripted_mount=0
 
 if [ -b $disk ]