Merge pull request #4095 from technosophos/issue/3880-fix-deisctl-hangs

fix(deisctl): exit when stop/start fails

Author: technosophos

deisctl/backend/fleet/fleet_test.go

@@ -45,6 +45,26 @@ func (c *stubFleetClient) UnitStates() ([]*schema.UnitState, error) {
 
 	return c.testUnitStates, nil
 }
+
+type failingFleetClient struct {
+	stubFleetClient
+}
+
+func (c *failingFleetClient) SetUnitTargetState(name, target string) error {
+	if err := c.stubFleetClient.SetUnitTargetState(name, target); err != nil {
+		return err
+	}
+
+	last := len(c.testUnitStates) - 1
+	c.testUnitStates[last] = &schema.UnitState{
+		Name:               name,
+		SystemdSubState:    "failed",
+		SystemdActiveState: "failed",
+	}
+
+	return nil
+}
+
 func (c *stubFleetClient) SetUnitTargetState(name, target string) error {
 
 	var activeState string
@@ -149,31 +169,6 @@ func (s *syncBuffer) Bytes() []byte {
 	return s.Buffer.Bytes()
 }
 
-/*
-func logState(outchan chan string, errchan chan error, errOutput *string, mutex *sync.Mutex) {
-	for {
-		select {
-		case _, ok := <-outchan:
-			if !ok {
-				outchan = nil
-			}
-		case err, ok := <-errchan:
-			if !ok {
-				errchan = nil
-			}
-			if err != nil {
-				mutex.Lock()
-				*errOutput += err.Error()
-				mutex.Unlock()
-			}
-		}
-		if outchan == nil && errchan == nil {
-			break
-		}
-	}
-}
-*/
-
 func TestNewClient(t *testing.T) {
 	t.Parallel()
 

deisctl/backend/fleet/start.go

@@ -86,6 +86,12 @@ func doStart(c *FleetClient, target string, wg *sync.WaitGroup, out, ew io.Write
 		}
 
 		lastSubState = currentState.SystemdSubState
+
+		if lastSubState == "failed" {
+			o := prettyprint.Colorize("{{.Red}}The service '%s' failed while starting.{{.Default}}\n")
+			fmt.Fprintf(ew, o, target)
+			return
+		}
 		time.Sleep(250 * time.Millisecond)
 	}
 }

deisctl/backend/fleet/start_test.go

@@ -1,31 +1,32 @@
 package fleet
 
 import (
+	"strings"
 	"sync"
 	"testing"
 
 	"github.com/coreos/fleet/schema"
 )
 
+var startTestUnits = []*schema.Unit{
+	&schema.Unit{
+		Name:         "deis-controller.service",
+		DesiredState: "loaded",
+	},
+	&schema.Unit{
+		Name:         "deis-builder.service",
+		DesiredState: "loaded",
+	},
+	&schema.Unit{
+		Name:         "deis-publisher.service",
+		DesiredState: "loaded",
+	},
+}
+
 func TestStart(t *testing.T) {
 	t.Parallel()
 
-	testUnits := []*schema.Unit{
-		&schema.Unit{
-			Name:         "deis-controller.service",
-			DesiredState: "loaded",
-		},
-		&schema.Unit{
-			Name:         "deis-builder.service",
-			DesiredState: "loaded",
-		},
-		&schema.Unit{
-			Name:         "deis-publisher.service",
-			DesiredState: "loaded",
-		},
-	}
-
-	testFleetClient := stubFleetClient{testUnits: testUnits,
+	testFleetClient := stubFleetClient{testUnits: startTestUnits,
 		unitsMutex: &sync.Mutex{}, unitStatesMutex: &sync.Mutex{}}
 
 	c := &FleetClient{Fleet: &testFleetClient}
@@ -68,3 +69,22 @@ func TestStart(t *testing.T) {
 		}
 	}
 }
+
+func TestStartFail(t *testing.T) {
+	fc := &failingFleetClient{stubFleetClient{
+		testUnits:       startTestUnits,
+		unitStatesMutex: &sync.Mutex{},
+		unitsMutex:      &sync.Mutex{},
+	}}
+	var wg sync.WaitGroup
+	c := &FleetClient{Fleet: fc}
+
+	var b syncBuffer
+	c.Start([]string{"deis-builder.service"}, &wg, &b, &b)
+	wg.Wait()
+
+	if !strings.Contains(b.String(), "failed while starting") {
+		t.Errorf("Expected failure during start. Got '%s'", b.String())
+	}
+
+}

deisctl/backend/fleet/stop.go

@@ -88,6 +88,13 @@ func doStop(c *FleetClient, target string, wg *sync.WaitGroup, out, ew io.Writer
 		}
 
 		lastSubState = currentState.SystemdSubState
+
+		if lastSubState == "failed" {
+			o := prettyprint.Colorize("{{.Red}}The service '%s' failed while stopping.{{.Default}}\n")
+			fmt.Fprintf(ew, o, target)
+			return
+		}
+
 		time.Sleep(250 * time.Millisecond)
 	}
 }

deisctl/backend/fleet/stop_test.go

@@ -1,6 +1,7 @@
 package fleet
 
 import (
+	"strings"
 	"sync"
 	"testing"
 
@@ -68,3 +69,37 @@ func TestStop(t *testing.T) {
 		}
 	}
 }
+
+var stopTestUnits = []*schema.Unit{
+	&schema.Unit{
+		Name:         "deis-controller.service",
+		DesiredState: "launched",
+	},
+	&schema.Unit{
+		Name:         "deis-builder.service",
+		DesiredState: "launched",
+	},
+	&schema.Unit{
+		Name:         "deis-publisher.service",
+		DesiredState: "launch",
+	},
+}
+
+func TestStopFail(t *testing.T) {
+	fc := &failingFleetClient{stubFleetClient{
+		testUnits:       stopTestUnits,
+		unitStatesMutex: &sync.Mutex{},
+		unitsMutex:      &sync.Mutex{},
+	}}
+	var wg sync.WaitGroup
+	c := &FleetClient{Fleet: fc}
+
+	var b syncBuffer
+	c.Stop([]string{"deis-builder.service"}, &wg, &b, &b)
+	wg.Wait()
+
+	if !strings.Contains(b.String(), "failed while stopping") {
+		t.Errorf("Expected 'failed while stopping'. Got '%s'", b.String())
+	}
+
+}