Merge pull request #2280 from mboersma/scale-does-start

fix(deisctl): "deisctl scale router=N" also starts units

Author: mboersma

deisctl/backend/fleet/create.go

@@ -2,15 +2,18 @@ package fleet
 
 import (
 	"fmt"
+	"strings"
 	"sync"
+	"time"
 
 	"github.com/coreos/fleet/job"
 	"github.com/coreos/fleet/schema"
 	"github.com/coreos/fleet/unit"
 )
 
 // Create schedules a new unit for the given component
-func (c *FleetClient) Create(targets []string, wg *sync.WaitGroup, outchan chan string, errchan chan error) {
+func (c *FleetClient) Create(
+	targets []string, wg *sync.WaitGroup, outchan chan string, errchan chan error) {
 
 	units := make([]*schema.Unit, len(targets))
 
@@ -53,6 +56,21 @@ func doCreate(c *FleetClient, unit *schema.Unit, wg *sync.WaitGroup, outchan cha
 		return
 	}
 
+	// loop until the unit actually exists in unit states
+outerLoop:
+	for {
+		time.Sleep(250 * time.Millisecond)
+		unitStates, err := cAPI.UnitStates()
+		if err != nil {
+			errchan <- err
+		}
+		for _, us := range unitStates {
+			if strings.HasPrefix(us.Name, unit.Name) {
+				break outerLoop
+			}
+		}
+	}
+
 	outchan <- out
 }
 

deisctl/backend/fleet/destroy.go

@@ -32,33 +32,23 @@ func doDestroy(c *FleetClient, target string, wg *sync.WaitGroup, outchan chan s
 	}
 	destroyed := fmt.Sprintf("\033[0;33m%v:\033[0m destroyed                                 \r", name)
 
-	// bail early if unit doesn't exist
-	_, err = c.Units(name)
-	if err != nil {
-		if strings.Contains(err.Error(), "could not find unit") {
-			outchan <- destroyed
-		}
-		return
-	}
+	// tell fleet to destroy the unit
+	c.Fleet.DestroyUnit(name)
 
-	// otherwise destroy it
-	if err = c.Fleet.DestroyUnit(name); err != nil {
-		// ignore already destroyed units
-		if !strings.Contains(err.Error(), "could not find unit") {
-			errchan <- err
-			return
-		}
-	}
-
-	// loop until actually destroyed
+	// loop until the unit is actually gone from unit states
+outerLoop:
 	for {
-		_, err = c.Units(name)
+		time.Sleep(250 * time.Millisecond)
+		unitStates, err := cAPI.UnitStates()
 		if err != nil {
-			if strings.Contains(err.Error(), "could not find unit") {
-				outchan <- destroyed
-				return
+			errchan <- err
+		}
+		for _, us := range unitStates {
+			if strings.HasPrefix(us.Name, name) {
+				continue outerLoop
 			}
 		}
-		time.Sleep(250 * time.Millisecond)
+		outchan <- destroyed
+		return
 	}
 }

deisctl/backend/fleet/scale.go

@@ -42,6 +42,11 @@ func scaleUp(c *FleetClient, component string, numExistingContainers, numTimesTo
 		target := component + "@" + strconv.Itoa(numExistingContainers+i+1)
 		c.Create([]string{target}, wg, outchan, errchan)
 	}
+	wg.Wait()
+	for i := 0; i < numTimesToScale; i++ {
+		target := component + "@" + strconv.Itoa(numExistingContainers+i+1)
+		c.Start([]string{target}, wg, outchan, errchan)
+	}
 }
 
 func scaleDown(c *FleetClient, component string, numExistingContainers, numTimesToScale int,