Merge lp:~bladernr/checkbox/1217268 into lp:checkbox

[Jeff Lane ]

scripts/storage test now checks to make sure there's enough free disk space before running bonnie++ and adjusts bonnie++ parameters accordingly if there is not enough free disk space. This avoids a bug causing false failures on systems with small disk drives.

scripts/storage_test now checks to make sure there's enough disk space and adjusts bonnie++ accordingly to avoid running out of disk space on small disks

[Zygmunt Krynicki (zyga)]

Looks good _BUT_ all the df / awk stuff makes me cry (it's very fragile, probably breaks when disk will have a space name in it) I would really like us to use saner APIs for that (udisks/gnome volume manager). This should also be reported upstream so that we don't have to carry patches like that in our tree.

review: Approve

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-08-29 16:14:14 +0000
+++ checkbox-old/debian/changelog	2013-08-29 23:49:56 +0000
@@ -2,7 +2,10 @@
 
   [ Jeff Lane ]
   * scripts/memory_compare: output now displays kB properly, not bytes labled
-  * as kB. (LP: #1217506)
+    as kB. (LP: #1217506)
+  * scripts/storage_test: script now ensures there is enough free disk space
+    before running bonnie++ and adjusts bonnie++ parameters accordingly if
+    necessary (LP: #1217268)
 
   [ Daniel Manrique ]
   * scripts/storage_test: Use parted silent mode to avoid hanging on disks

=== modified file 'checkbox-old/scripts/storage_test'
--- checkbox-old/scripts/storage_test	2013-08-28 15:34:41 +0000
+++ checkbox-old/scripts/storage_test	2013-08-29 23:49:56 +0000
@@ -4,12 +4,30 @@
 
 function run_bonnie() {
     echo "Running bonnie++ on $1..."
-
-    # Determine where to put the scratchdisk
-    mount_point=$(df -h | grep $1 | awk '{print $6}')
+    mount_point=$(df -h | grep -m 1 $1 | awk '{print $6}')
     echo "Putting scratch disk at $mount_point"
     mkdir -p "$mount_point/tmp/scratchdir"
-    bonnie++ -d "$mount_point/tmp/scratchdir" -u root
+    
+    # When running on disks with small drives (SSD/flash) we need to do
+    # some tweaking. Bonnie uses 2x RAM by default to write data. If that's 
+    # more than available disk space, the test will fail inappropriately.
+    free_space=$(df -m | grep -m 1 $1 | awk '{print $4}')
+    echo "    Disk $1 has ${free_space}MB available"
+    memory=$(free -m |grep Mem|awk '{print $2}')
+    echo "    System has ${memory}MB RAM"
+    disk_needed=$((memory * 2))
+    echo "    We need ${disk_needed}MB of disk space for testing"
+    if [[ "$disk_needed" -ge "$free_space" ]]; then
+        echo "    Insufficient disk space available for defaults."
+        echo "    reducing memory footprint to be 1/2 of free disk space."
+        # we need to pass an amount that's 1/2 the amount of available disk
+        # space to bonnie++ so she doesn't overwrite and fail.
+        disk_needed=$(($free_space/2))
+        bonnie++ -d $mount_point/tmp/scratchdir -u root -r $disk_needed
+    else
+        echo "   Free disk space is sufficient to continue testing."
+        bonnie++ -d $mount_point/tmp/scratchdir -u root
+    fi
 }
 
 disk=/dev/$1