Merge pull request #4232 from andrestc/apt-retry

libmachine/provision: retries pkg installation if fails to get lock

libmachine/provision/debian.go

@@ -64,11 +64,7 @@ func (provisioner *DebianProvisioner) Package(name string, action pkgaction.Pack
 
 	log.Debugf("package: action=%s name=%s", action.String(), name)
 
-	if _, err := provisioner.SSHCommand(command); err != nil {
-		return err
-	}
-
-	return nil
+	return waitForLock(provisioner, command)
 }
 
 func (provisioner *DebianProvisioner) dockerDaemonResponding() bool {

libmachine/provision/ubuntu_systemd.go

@@ -80,11 +80,7 @@ func (provisioner *UbuntuSystemdProvisioner) Package(name string, action pkgacti
 
 	log.Debugf("package: action=%s name=%s", action.String(), name)
 
-	if _, err := provisioner.SSHCommand(command); err != nil {
-		return err
-	}
-
-	return nil
+	return waitForLock(provisioner, command)
 }
 
 func (provisioner *UbuntuSystemdProvisioner) dockerDaemonResponding() bool {

libmachine/provision/ubuntu_upstart.go

@@ -96,11 +96,7 @@ func (provisioner *UbuntuProvisioner) Package(name string, action pkgaction.Pack
 
 	log.Debugf("package: action=%s name=%s", action.String(), name)
 
-	if _, err := provisioner.SSHCommand(command); err != nil {
-		return err
-	}
-
-	return nil
+	return waitForLock(provisioner, command)
 }
 
 func (provisioner *UbuntuProvisioner) dockerDaemonResponding() bool {

libmachine/provision/utils.go

@@ -296,9 +296,13 @@ func DockerClientVersion(ssh SSHCommander) (string, error) {
 }
 
 func waitForLockAptGetUpdate(ssh SSHCommander) error {
+	return waitForLock(ssh, "sudo apt-get update")
+}
+
+func waitForLock(ssh SSHCommander, cmd string) error {
 	var sshErr error
 	err := mcnutils.WaitFor(func() bool {
-		_, sshErr = ssh.SSHCommand("sudo apt-get update")
+		_, sshErr = ssh.SSHCommand(cmd)
 		if sshErr != nil {
 			if strings.Contains(sshErr.Error(), "Could not get lock") {
 				sshErr = nil
@@ -309,10 +313,10 @@ func waitForLockAptGetUpdate(ssh SSHCommander) error {
 		return true
 	})
 	if sshErr != nil {
-		return fmt.Errorf("Error running apt-get update: %s", sshErr)
+		return fmt.Errorf("Error running %q: %s", cmd, sshErr)
 	}
 	if err != nil {
-		return fmt.Errorf("Failed to obtain apt-get update lock: %s", err)
+		return fmt.Errorf("Failed to obtain lock: %s", err)
 	}
 	return nil
 }