Merge pull request #1597 from nathanleclaire/ls_timeout

Add Timeout state to ls command

libmachine/host.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"time"
 
 	"github.com/docker/machine/drivers"
 	"github.com/docker/machine/libmachine/auth"
@@ -26,6 +27,7 @@ var (
 	validHostNameChars                = `[a-zA-Z0-9\-\.]`
 	validHostNamePattern              = regexp.MustCompile(`^` + validHostNameChars + `+$`)
 	errMachineMustBeRunningForUpgrade = errors.New("Error: machine must be running to upgrade.")
+	stateTimeoutDuration              = time.Second * 3
 )
 
 type Host struct {
@@ -357,7 +359,7 @@ func WaitForSSH(h *Host) error {
 	return drivers.WaitForSSH(h.Driver)
 }
 
-func getHostState(host Host, hostListItemsChan chan<- HostListItem) {
+func attemptGetHostState(host Host, stateQueryChan chan<- HostListItem) {
 	currentState, err := host.Driver.GetState()
 	if err != nil {
 		log.Errorf("error getting state for host %s: %s", host.Name, err)
@@ -374,7 +376,7 @@ func getHostState(host Host, hostListItemsChan chan<- HostListItem) {
 
 	dockerHost := os.Getenv("DOCKER_HOST")
 
-	hostListItemsChan <- HostListItem{
+	stateQueryChan <- HostListItem{
 		Name:         host.Name,
 		Active:       dockerHost == url && currentState != state.Stopped,
 		DriverName:   host.Driver.DriverName(),
@@ -384,6 +386,29 @@ func getHostState(host Host, hostListItemsChan chan<- HostListItem) {
 	}
 }
 
+func getHostState(host Host, hostListItemsChan chan<- HostListItem) {
+	// This channel is used to communicate the properties we are querying
+	// about the host in the case of a successful read.
+	stateQueryChan := make(chan HostListItem)
+
+	go attemptGetHostState(host, stateQueryChan)
+
+	select {
+	// If we get back useful information, great.  Forward it straight to
+	// the original parent channel.
+	case hli := <-stateQueryChan:
+		hostListItemsChan <- hli
+
+	// Otherwise, give up after a predetermined duration.
+	case <-time.After(stateTimeoutDuration):
+		hostListItemsChan <- HostListItem{
+			Name:       host.Name,
+			DriverName: host.Driver.DriverName(),
+			State:      state.Timeout,
+		}
+	}
+}
+
 func GetHostListItems(hostList []*Host) []HostListItem {
 	hostListItems := []HostListItem{}
 	hostListItemsChan := make(chan HostListItem)

state/state.go

@@ -12,6 +12,7 @@ const (
 	Stopping
 	Starting
 	Error
+	Timeout
 )
 
 var states = []string{
@@ -23,6 +24,7 @@ var states = []string{
 	"Stopping",
 	"Starting",
 	"Error",
+	"Timeout",
 }
 
 // Given a State type, returns its string representation