diff options
| author | PMR <pmr@pmr-lander> | 2020-03-26 13:27:16 +0000 |
|---|---|---|
| committer | PMR <pmr@pmr-lander> | 2020-03-26 13:27:16 +0000 |
| commit | 9786a4a969df745792bb142894a317d863ef0c07 (patch) | |
| tree | e4dd28adb39437c193c61439d49c8b1e2868abc0 | |
| parent | c5da0a729775a9abbacd5a83cb3e4a00c1543cea (diff) | |
| parent | 3b9e4d05e00dcb166e212bc5ff16b1abcd2cba47 (diff) | |
Merge #381120 from ~rodsmith/plainbox-provider-checkbox:update-disk-read-performance-thresholds
Update disk_read_performance_test with new device types & more modern minimum acceptable speeds.
| -rwxr-xr-x | bin/disk_read_performance_test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/bin/disk_read_performance_test b/bin/disk_read_performance_test index 8d6d6a0..bcf1c75 100755 --- a/bin/disk_read_performance_test +++ b/bin/disk_read_performance_test @@ -13,6 +13,10 @@ for disk in $@; do disk_type=`udevadm info --name /dev/$disk --query property | grep "ID_BUS" | awk '{gsub(/ID_BUS=/," ")}{printf $1}'` dev_path=`udevadm info --name /dev/$disk --query property | grep "DEVPATH" | awk '{gsub(/DEVPATH=/," ")}{printf $1}'` + # /sys/block/$disk/queue/rotational was added with Linux 2.6.29. If file is + # not present, test below will fail & disk will be considered an HDD, not + # an SSD. + rotational=`cat /sys/block/$disk/queue/rotational` if [[ $dev_path =~ dm ]]; then disk_type="devmapper" fi @@ -25,6 +29,12 @@ for disk in $@; do if [[ $dev_path =~ mmc ]]; then disk_type="mmc" fi + if [[ $dev_path =~ pmem ]]; then + disk_type="nvdimm" + fi + if [[ ($disk_type == "scsi" || $disk_type == "ata") && $rotational == 0 ]]; then + disk_type="ssd" + fi if [ -z "$disk_type" ]; then echo "ERROR: disk type not recognized" exit 1 @@ -49,7 +59,11 @@ for disk in $@; do "ide" ) MIN_BUF_READ=40;; "mmc" ) MIN_BUF_READ=$DEFAULT_BUF_READ;; "nvme" ) MIN_BUF_READ=200;; + "nvdimm" ) MIN_BUF_READ=500;; "mdadm" ) MIN_BUF_READ=80;; + "ata" ) MIN_BUF_READ=100;; + "scsi" ) MIN_BUF_READ=100;; + "ssd" ) MIN_BUF_READ=200;; * ) MIN_BUF_READ=$DEFAULT_BUF_READ;; esac echo "INFO: $disk_type: Using $MIN_BUF_READ MB/sec as the minimum throughput speed" |