fix(destroy): wait for job state inactive on destroy

Author: Gabriel Monroy

README.md

@@ -51,13 +51,13 @@ deis-registry-data.service: loaded
 deis-logger-data.service: loaded
 deis-builder-data.service: loaded
 
-Activating data containers...
+Launching data containers...
 deis-database-data.service: launched
 deis-registry-data.service: launched
 deis-logger-data.service: launched
 deis-builder-data.service: launched
 
-Scheduling units...
+Scheduling service containers...
 deis-database@1.service: loaded
 deis-cache@1.service: loaded
 deis-logger@1.service: loaded
@@ -66,15 +66,14 @@ deis-controller@1.service: loaded
 deis-builder@1.service: loaded
 deis-router@1.service: loaded
 
-Activating units...
+Launching service containers...
 deis-logger@1.service: launched
 deis-cache@1.service: launched
 deis-database@1.service: launched
 deis-registry@1.service: launched
 deis-controller@1.service: launched
 deis-builder@1.service: launched
 deis-router@1.service: launched
-
 Done.
 ```
 
@@ -85,13 +84,16 @@ You can also use the `deisctl uninstall` command to destroy platform units:
 
 ```console
 $ deisctl uninstall
-Destroyed Unit deis-database@1.service
-Destroyed Unit deis-cache@1.service
-Destroyed Unit deis-logger@1.service
-Destroyed Unit deis-registry@1.service
-Destroyed Unit deis-controller@1.service
-Destroyed Unit deis-builder@1.service
-Destroyed Unit deis-router@1.service
+
+Destroying service containers...
+deis-database@1.service: inactive
+deis-cache@1.service: inactive
+deis-logger@1.service: inactive
+deis-registry@1.service: inactive
+deis-controller@1.service: inactive
+deis-builder@1.service: inactive
+deis-router@1.service: inactive
+Done.
 ```
 
 To uninstall a specific component, use `deisctl uninstall router`.

client/create.go

@@ -17,7 +17,7 @@ func (c *FleetClient) Create(target string) (err error) {
 		unitFile *unit.UnitFile
 	)
 	// create unit
-	unitName, unitFile, err = c.createUnit(target)
+	unitName, unitFile, err = c.createUnitFile(target)
 	if err != nil {
 		return err
 	}
@@ -28,7 +28,10 @@ func (c *FleetClient) Create(target string) (err error) {
 	}
 	// schedule unit
 	if err := c.Fleet.CreateUnit(u); err != nil {
-		return fmt.Errorf("failed creating job %s: %v", unitName, err)
+		// ignore units that already exist
+		if err.Error() != "job already exists" {
+			return fmt.Errorf("failed creating job %s: %v", unitName, err)
+		}
 	}
 	desiredState := string(job.JobStateLoaded)
 	err = c.Fleet.SetUnitTargetState(unitName, desiredState)
@@ -43,7 +46,7 @@ func (c *FleetClient) Create(target string) (err error) {
 	return nil
 }
 
-func (c *FleetClient) createUnit(target string) (unitName string, uf *unit.UnitFile, err error) {
+func (c *FleetClient) createUnitFile(target string) (unitName string, uf *unit.UnitFile, err error) {
 	component, num, err := splitTarget(target)
 	if err != nil {
 		return

client/destroy.go

@@ -2,11 +2,13 @@ package client
 
 import (
 	"fmt"
+
+	"github.com/coreos/fleet/job"
 )
 
 // Destroy units for a given target
-func (c *FleetClient) Destroy(target string) (err error) {
-	component, num, err := splitTarget(target)
+func (c *FleetClient) Destroy(targets string) (err error) {
+	component, num, err := splitTarget(targets)
 	if err != nil {
 		return
 	}
@@ -16,17 +18,23 @@ func (c *FleetClient) Destroy(target string) (err error) {
 			return err
 		}
 	}
-	unitName, err := formatUnitName(component, num)
+	name, err := formatUnitName(component, num)
 	if err != nil {
 		return err
 	}
-	_, err = c.Fleet.Unit(unitName)
+
+	desiredState := string(job.JobStateInactive)
+	err = c.Fleet.SetUnitTargetState(name, desiredState)
 	if err != nil {
-		return
+		return err
+	}
+	outchan, errchan := waitForUnitStates([]string{name}, desiredState)
+	err = printUnitState(name, outchan, errchan)
+	if err != nil {
+		return err
 	}
-	if err = c.Fleet.DestroyUnit(unitName); err != nil {
-		return fmt.Errorf("failed destroying job %s: %v", unitName, err)
+	if err = c.Fleet.DestroyUnit(name); err != nil {
+		return fmt.Errorf("failed destroying job %s: %v", name, err)
 	}
-	fmt.Printf("Destroyed Unit %s\n", unitName)
 	return
 }

cmd/cmd.go

@@ -119,19 +119,19 @@ func installDataContainers(c client.Client) error {
 		"logger-data",
 		"builder-data",
 	}
-	fmt.Println("Scheduling data containers...")
+	fmt.Println("\nScheduling data containers...")
 	for _, dataContainer := range dataContainers {
-		c.Create(dataContainer)
-		// if err != nil {
-		// 	return err
-		// }
+		err := c.Create(dataContainer)
+		if err != nil {
+			return err
+		}
 	}
-	fmt.Println("Activating data containers...")
+	fmt.Println("\nLaunching data containers...")
 	for _, dataContainer := range dataContainers {
-		c.Start(dataContainer)
-		// if err != nil {
-		// 	return err
-		// }
+		err := c.Start(dataContainer)
+		if err != nil {
+			return err
+		}
 	}
 	return nil
 }
@@ -146,9 +146,9 @@ func installDefaultServices(c client.Client) error {
 		"controller=1",
 		"builder=1",
 		"router=1"}
-	fmt.Println("Scheduling units...")
+	fmt.Println("\nScheduling service containers...")
 	err := Scale(c, targets)
-	fmt.Println("Activating units...")
+	fmt.Println("\nLaunching service containers...")
 	err = Start(c, []string{"logger", "cache", "database"})
 	if err != nil {
 		return err
@@ -174,13 +174,12 @@ func installDefaultServices(c client.Client) error {
 }
 
 func Uninstall(c client.Client, targets []string) error {
-	// if targets, uninstall all services
+	// if no targets, uninstall all services
 	if len(targets) == 0 {
 		err := uninstallAllServices(c)
 		if err != nil {
 			return err
 		}
-
 	} else {
 		// uninstall the specific target
 		for _, target := range targets {
@@ -202,7 +201,9 @@ func uninstallAllServices(c client.Client) error {
 		"controller=0",
 		"builder=0",
 		"router=0"}
+	fmt.Println("\nDestroying service containers...")
 	err := Scale(c, targets)
+	fmt.Println("Done.")
 	return err
 }