Merge pull request docker-archive-public#1277 from ggiamarchi/openstack/bug#1269

ehazlett · ehazlett · commit 3cd44ec4eff4 · 2015-06-01T08:40:59.000-04:00
Openstack / Stop polling the instance when status is ERROR
diff --git a/drivers/openstack/client.go b/drivers/openstack/client.go
@@ -4,8 +4,10 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net/http"
+	"time"
 
 	"github.com/docker/machine/log"
+	"github.com/docker/machine/utils"
 	"github.com/docker/machine/version"
 	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/openstack"
@@ -31,7 +33,7 @@ type Client interface {
 	StopInstance(d *Driver) error
 	RestartInstance(d *Driver) error
 	DeleteInstance(d *Driver) error
-	WaitForInstanceStatus(d *Driver, status string, timeout int) error
+	WaitForInstanceStatus(d *Driver, status string) error
 	GetInstanceIpAddresses(d *Driver) ([]IpAddress, error)
 	CreateKeyPair(d *Driver, name string, publicKey string) error
 	DeleteKeyPair(d *Driver, name string) error
@@ -132,11 +134,23 @@ func (c *GenericClient) DeleteInstance(d *Driver) error {
 	return nil
 }
 
-func (c *GenericClient) WaitForInstanceStatus(d *Driver, status string, timeout int) error {
-	if err := servers.WaitForStatus(c.Compute, d.MachineId, status, timeout); err != nil {
-		return err
-	}
-	return nil
+func (c *GenericClient) WaitForInstanceStatus(d *Driver, status string) error {
+	return utils.WaitForSpecificOrError(func() (bool, error) {
+		current, err := servers.Get(c.Compute, d.MachineId).Extract()
+		if err != nil {
+			return true, err
+		}
+
+		if current.Status == "ERROR" {
+			return true, fmt.Errorf("Instance creation failed. Instance is in ERROR state")
+		}
+
+		if current.Status == status {
+			return true, nil
+		}
+
+		return false, nil
+	}, 50, 4*time.Second)
 }
 
 func (c *GenericClient) GetInstanceIpAddresses(d *Driver) ([]IpAddress, error) {
diff --git a/drivers/openstack/openstack.go b/drivers/openstack/openstack.go
@@ -664,7 +664,7 @@ func (d *Driver) assignFloatingIp() error {
 
 func (d *Driver) waitForInstanceActive() error {
 	log.WithField("MachineId", d.MachineId).Debug("Waiting for the OpenStack instance to be ACTIVE...")
-	if err := d.client.WaitForInstanceStatus(d, "ACTIVE", 200); err != nil {
+	if err := d.client.WaitForInstanceStatus(d, "ACTIVE"); err != nil {
 		return err
 	}
 	return nil
diff --git a/utils/utils.go b/utils/utils.go
@@ -94,16 +94,26 @@ func CopyFile(src, dst string) error {
 	return nil
 }
 
-func WaitForSpecific(f func() bool, maxAttempts int, waitInterval time.Duration) error {
+func WaitForSpecificOrError(f func() (bool, error), maxAttempts int, waitInterval time.Duration) error {
 	for i := 0; i < maxAttempts; i++ {
-		if f() {
+		stop, err := f()
+		if err != nil {
+			return err
+		}
+		if stop {
 			return nil
 		}
 		time.Sleep(waitInterval)
 	}
 	return fmt.Errorf("Maximum number of retries (%d) exceeded", maxAttempts)
 }
 
+func WaitForSpecific(f func() bool, maxAttempts int, waitInterval time.Duration) error {
+	return WaitForSpecificOrError(func() (bool, error) {
+		return f(), nil
+	}, maxAttempts, waitInterval)
+}
+
 func WaitFor(f func() bool) error {
 	return WaitForSpecific(f, 60, 3*time.Second)
 }

Original file line number	Diff line number	Diff line change
`@@ -664,7 +664,7 @@ func (d *Driver) assignFloatingIp() error {`
`664`	`664`
`665`	`665`	`func (d *Driver) waitForInstanceActive() error {`
`666`	`666`	`log.WithField("MachineId", d.MachineId).Debug("Waiting for the OpenStack instance to be ACTIVE...")`
`667`		`- if err := d.client.WaitForInstanceStatus(d, "ACTIVE", 200); err != nil {`
	`667`	`+ if err := d.client.WaitForInstanceStatus(d, "ACTIVE"); err != nil {`
`668`	`668`	`return err`
`669`	`669`	`}`
`670`	`670`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -94,16 +94,26 @@ func CopyFile(src, dst string) error {`
`94`	`94`	`return nil`
`95`	`95`	`}`
`96`	`96`
`97`		`-func WaitForSpecific(f func() bool, maxAttempts int, waitInterval time.Duration) error {`
	`97`	`+func WaitForSpecificOrError(f func() (bool, error), maxAttempts int, waitInterval time.Duration) error {`
`98`	`98`	`for i := 0; i < maxAttempts; i++ {`
`99`		`- if f() {`
	`99`	`+ stop, err := f()`
	`100`	`+ if err != nil {`
	`101`	`+ return err`
	`102`	`+ }`
	`103`	`+ if stop {`
`100`	`104`	`return nil`
`101`	`105`	`}`
`102`	`106`	`time.Sleep(waitInterval)`
`103`	`107`	`}`
`104`	`108`	`return fmt.Errorf("Maximum number of retries (%d) exceeded", maxAttempts)`
`105`	`109`	`}`
`106`	`110`
	`111`	`+func WaitForSpecific(f func() bool, maxAttempts int, waitInterval time.Duration) error {`
	`112`	`+ return WaitForSpecificOrError(func() (bool, error) {`
	`113`	`+ return f(), nil`
	`114`	`+ }, maxAttempts, waitInterval)`
	`115`	`+}`
	`116`	`+`
`107`	`117`	`func WaitFor(f func() bool) error {`
`108`	`118`	`return WaitForSpecific(f, 60, 3*time.Second)`
`109`	`119`	`}`