Merge lp:~sergiusens/goget-ubuntu-touch/space-errors into lp:goget-ubuntu-touch

[Sergio Schvezov]

ubuntu-device-flash: remove previous failed flashing artifacts and if still not enough space, fail with an error message with the amount of available space on the target

You can trigger the error path by doing
dd if=/dev/zero of=/cache/recovery/bigfile bs=1024k count=510

Or make sure it works later by
mv /cache/recovery/bigfile /cache/recovery/bigfile.xz

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/30/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-armhf-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/30/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

Looks like there is an error handeling here:

39 + if len(free) > 3 {
40 + freeSpace = free[3]
41 + }

probably you want to do something when the length is not the correct one, right?

review: Needs Information

[lp:~sergiusens/goget-ubuntu-touch/space-errors]

36. By Sergio Schvezov on 2014-04-16

Adding default displays when input not of expected minimum length

[Manuel de la Peña (mandel)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-armhf-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/goget-ubuntu-touch-trusty-i386-ci/32

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/goget-ubuntu-touch-ci/32/rebuild

review: Approve (continuous-integration)

[XiaoGuo, Liu (liu-xiao-guo)]

liuxg@liuxg:~/copu$ ubuntu-device-flash --channel ubuntu-touch/utopic-proposed --wipe --revision=75 --bootstrap
2014/06/26 17:11:14 Expecting the device to be in the bootloader... waiting
2014/06/26 17:11:14 Device is |mako|
2014/06/26 17:11:18 Flashing version 75 from ubuntu-touch/utopic-proposed channel and server https://system-image.ubuntu.com to device mako
334.02 MB / 334.02 MB [==================================] 100.00 % 715.31 KB/s
/home/liuxg/.cache/ubuntuimages/pool/device-8e3e30aa503cbe9b6fdf3497ad5cf38398f8bcf88c80d98a988a4ad464b3db28.tar.xz
2014/06/26 17:20:34 Cannot cleanup tree to ensure clean deploymentexit status 255

I got this error too when I am trying to flash my phone software. no matter which version is being flashed. I am going to have a demo tomorrow. Could you please help to provide a solution to it?

thanks!

[Sergio Schvezov (sergiusens)]

How is this related to the merge proposal? Please take time to read: http://developer.ubuntu.com/start/ubuntu-for-devices/installing-ubuntu-for-devices/

or log a proper bug report

=== modified file 'devices/adb.go'
--- devices/adb.go	2014-02-24 15:10:17 +0000
+++ devices/adb.go	2014-04-16 17:35:43 +0000
@@ -49,6 +49,17 @@
 	adb.params = append(adb.params, []string{"-s", serial}...)
 }
 
+// Shell runs a specific command on the target device
+func (adb *AndroidDebugBridge) Shell(command ...string) (string, error) {
+	cmd := append(adb.params, "shell")
+	cmd = append(cmd, command...)
+	out, err := exec.Command(adbCommand, cmd...).Output()
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(string(out)), nil
+}
+
 // GetDevice parses the android property system to determine the device being used
 func (adb *AndroidDebugBridge) GetDevice() (deviceName string, err error) {
 	cmd := append(adb.params, []string{"shell", "getprop", "ro.product.device"}...)

=== modified file 'ubuntu-device-flash/main.go'
--- ubuntu-device-flash/main.go	2014-04-16 11:43:38 +0000
+++ ubuntu-device-flash/main.go	2014-04-16 17:35:43 +0000
@@ -202,19 +202,34 @@
 
 // bitPusher
 func bitPusher(adb devices.UbuntuDebugBridge, files <-chan Files, done chan<- bool) {
+	if _, err := adb.Shell("rm -rf /cache/recovery/*.xz /cache/recovery/*.xz.asc"); err != nil {
+		log.Fatal("Cannot cleanup tree to ensure clean deployment", err)
+	}
+	freeSpace := "unknown"
+	dfCacheCmd := "df -h | grep /dev/disk/by-partlabel/cache"
+	if free, err := adb.Shell(dfCacheCmd); err != nil {
+		log.Fatal("Unable to retrieve free space on target")
+	} else {
+		//Filesystem Size Used Avail Use% Mounted on
+		free := strings.Fields(free)
+		if len(free) > 3 {
+			freeSpace = free[3]
+		}
+	}
+	errMsg := "Cannot push %s to device: free space on /cache/recovery is %s"
 	for {
 		file := <-files
 		go func() {
 			log.Printf("Start pushing %s to device", file.FilePath)
 			err := adb.Push(file.FilePath, "/cache/recovery/")
 			if err != nil {
-				log.Fatalf("Cannot push %s to device", file.FilePath)
+				log.Fatalf(errMsg, file.SigPath, freeSpace)
 			}
 			err = adb.Push(file.SigPath, "/cache/recovery/")
 			if err != nil {
-				log.Fatalf("Cannot push %s to device", file.SigPath)
+				log.Fatalf(errMsg, file.SigPath, freeSpace)
 			}
-			log.Printf("Done pushing %s to device", file.SigPath)
+			log.Printf("Done pushing %s to device", file.FilePath)
 			done <- true
 		}()
 	}