Merge lp:~bladernr/checkbox/1078897-dont-offline-cpu0 into lp:checkbox

[Jeff Lane ]

script no longer offlines cpu0. Also fixed output so it only appears on failure, where it is needed for debug, not on success where a simple result message will suffice.

Also tested on x86 systems and an AC100 for arm compatibility, the original failure seen on ARM is no longer an issue with these changes on the system I reported the problem against.

[Daniel Manrique (roadmr)]

Looks good and works fine, thanks! I'm not sure how much of an issue not testing offlining of CPU0 on intel systems will be, but in reality, if we offlined it and the script is still working, it means something else is weird. This is more correct behavior I think.

review: Approve

[Daniel Manrique (roadmr)]

Apologies, the failure of canonical's web servers killed tarmac last night. I restarted it, expect this merge to be processed in about 40 minutes from this comment.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-26 17:26:20 +0000
+++ debian/changelog	2013-04-30 17:42:34 +0000
@@ -1,6 +1,9 @@
 checkbox (0.16.1) UNRELEASED; urgency=low
 
-  * Incremented version 
+  [ Jeff Lane ]
+  * scripts/cpu_offlining: Modified script to no longer offline cpu0 to resolve
+    a bug on ARM. Modified output so most of it is redirected to stderr for
+    fail cases, we don't need that much for success cases. (LP: #1078897) 
 
  -- Brendan Donegan <[e-mail]>  Fri, 26 Apr 2013 18:23:03 +0100
 

=== modified file 'scripts/cpu_offlining'
--- scripts/cpu_offlining	2012-07-11 01:31:30 +0000
+++ scripts/cpu_offlining	2013-04-30 17:42:34 +0000
@@ -1,19 +1,23 @@
 #!/bin/bash
 
-echo "Beginning CPU Offlining Test"
+echo "Beginning CPU Offlining Test" 1>&2
 
 result=0
+cpu_count=0
 
 # Turn CPU cores off
 for cpu_num in `ls /sys/devices/system/cpu | grep -o cpu[0-9]*`; do
     if [ -f /sys/devices/system/cpu/$cpu_num/online ]; then
-        echo "Offlining $cpu_num"
-        echo 0 > /sys/devices/system/cpu/$cpu_num/online
+        if [ "$cpu_num" != "cpu0" ]; then
+            ((cpu_count++))
+            echo "Offlining $cpu_num" 1>&2
+            echo 0 > /sys/devices/system/cpu/$cpu_num/online
 
-        grep -w -i -q $cpu_num /proc/interrupts
-        if [ $? -eq 0 ]; then
-            echo "ERROR: Failed to offline $cpu_num" >&2
-            result=1
+            grep -w -i -q $cpu_num /proc/interrupts
+            if [ $? -eq 0 ]; then
+                echo "ERROR: Failed to offline $cpu_num" 1>&2
+                result=1
+            fi
         fi
     fi
 done
@@ -21,14 +25,22 @@
 # Back on again
 for cpu_num in `ls /sys/devices/system/cpu | grep -o cpu[0-9]*`; do
     if [ -f /sys/devices/system/cpu/$cpu_num/online ]; then
-        echo "Onlining $cpu_num"
-        echo 1 > /sys/devices/system/cpu/$cpu_num/online
-        grep -w -i -q $cpu_num /proc/interrupts
-        if [ $? -eq 1 ]; then
-            echo "ERROR: Failed to online $cpu_num" >&2
-            result=1
+        if [ "$cpu_num" != "cpu0" ]; then        
+            echo "Onlining $cpu_num" 1>&2
+            echo 1 > /sys/devices/system/cpu/$cpu_num/online
+            grep -w -i -q $cpu_num /proc/interrupts
+            if [ $? -eq 1 ]; then
+                echo "ERROR: Failed to online $cpu_num" 1>&2
+                result=1
+            fi
         fi
     fi
 done
 
+if [ $result -eq 0 ]; then
+    echo "Successfully turned $cpu_count cores off and back on"
+else
+    echo "Error with offlining one or more cores." 1>&2
+fi
+
 exit $result