refactor(*): remove auto scale on create/destroy

Author: Gabriel Monroy

client/create.go

@@ -16,12 +16,12 @@ func (c *FleetClient) Create(target string) (err error) {
 		unitName string
 		unitFile *unit.UnitFile
 	)
-	// create unit
+	// create unit file
 	unitName, unitFile, err = c.createUnitFile(target)
 	if err != nil {
 		return err
 	}
-	//
+	// define unit
 	u := &schema.Unit{
 		Name:    unitName,
 		Options: schema.MapUnitFileToSchemaUnitOptions(unitFile),
@@ -64,14 +64,6 @@ func (c *FleetClient) createUnitFile(target string) (unitName string, uf *unit.U
 
 // Create normal service unit
 func (c *FleetClient) createServiceUnit(component string, num int) (name string, uf *unit.UnitFile, err error) {
-	// if number wasn't provided get next unit number
-	if num == 0 {
-		num, err = c.nextUnit(component)
-		if err != nil {
-			return "", nil, err
-		}
-	}
-	// build a fleet unit
 	name, err = formatUnitName(component, num)
 	if err != nil {
 		return "", nil, err

client/destroy.go

@@ -2,27 +2,54 @@ package client
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/coreos/fleet/job"
 )
 
 // Destroy units for a given target
-func (c *FleetClient) Destroy(targets string) (err error) {
-	component, num, err := splitTarget(targets)
+func (c *FleetClient) Destroy(target string) (err error) {
+	component, num, err := splitTarget(target)
 	if err != nil {
 		return
 	}
-	if num == 0 {
-		num, err = c.lastUnit(component)
-		if err != nil {
-			return err
-		}
+	if strings.HasSuffix(component, "-data") {
+		err = c.destroyDataUnit(component)
+	} else {
+		err = c.destroyServiceUnit(component, num)
 	}
+	if err != nil {
+		return err
+	}
+	return
+}
+
+func (c *FleetClient) destroyServiceUnit(component string, num int) (err error) {
 	name, err := formatUnitName(component, num)
 	if err != nil {
 		return err
 	}
+	desiredState := string(job.JobStateInactive)
+	err = c.Fleet.SetUnitTargetState(name, desiredState)
+	if err != nil {
+		return err
+	}
+	outchan, errchan := waitForUnitStates([]string{name}, desiredState)
+	err = printUnitState(name, outchan, errchan)
+	if err != nil {
+		return err
+	}
+	if err = c.Fleet.DestroyUnit(name); err != nil {
+		return fmt.Errorf("failed destroying job %s: %v", name, err)
+	}
+	return err
+}
 
+func (c *FleetClient) destroyDataUnit(component string) (err error) {
+	name, err := formatUnitName(component, 0)
+	if err != nil {
+		return err
+	}
 	desiredState := string(job.JobStateInactive)
 	err = c.Fleet.SetUnitTargetState(name, desiredState)
 	if err != nil {
@@ -36,5 +63,6 @@ func (c *FleetClient) Destroy(targets string) (err error) {
 	if err = c.Fleet.DestroyUnit(name); err != nil {
 		return fmt.Errorf("failed destroying job %s: %v", name, err)
 	}
-	return
+	return err
+
 }

client/journal.go

@@ -7,7 +7,7 @@ import (
 
 // Journal prints the systemd journal of target unit(s)
 func (c *FleetClient) Journal(target string) (err error) {
-	units, err := c.getUnits(target)
+	units, err := c.Units(target)
 	if err != nil {
 		return
 	}

client/scale.go

@@ -1,24 +1,34 @@
 package client
 
+import "strconv"
+
 // Scale creates or destroys units to match the desired number
 func (c *FleetClient) Scale(component string, num int) (err error) {
 	for {
-		components, err := c.getUnits(component)
+		components, err := c.Units(component)
 		if err != nil {
 			return err
 		}
 		if len(components) == num {
 			break
 		}
 		if len(components) < num {
-			err := c.Create(component)
+			num, err = c.nextUnit(component)
+			if err != nil {
+				return err
+			}
+			err := c.Create(component + "@" + strconv.Itoa(num))
 			if err != nil {
 				return err
 			}
 			continue
 		}
 		if len(components) > num {
-			err := c.Destroy(component)
+			num, err = c.lastUnit(component)
+			if err != nil {
+				return err
+			}
+			err := c.Destroy(component + "@" + strconv.Itoa(num))
 			if err != nil {
 				return err
 			}

client/start.go

@@ -4,7 +4,7 @@ import "github.com/coreos/fleet/job"
 
 // Start launches target units and blocks until active
 func (c *FleetClient) Start(target string) (err error) {
-	units, err := c.getUnits(target)
+	units, err := c.Units(target)
 	if err != nil {
 		return
 	}

client/status.go

@@ -7,7 +7,7 @@ import (
 
 // Status prints the systemd status of target unit(s)
 func (c *FleetClient) Status(target string) (err error) {
-	units, err := c.getUnits(target)
+	units, err := c.Units(target)
 	if err != nil {
 		return
 	}

client/stop.go

@@ -4,7 +4,7 @@ import "github.com/coreos/fleet/job"
 
 // Stop sets target units to inactive and blocks until complete
 func (c *FleetClient) Stop(target string) (err error) {
-	units, err := c.getUnits(target)
+	units, err := c.Units(target)
 	if err != nil {
 		return
 	}

client/unit.go

@@ -16,7 +16,7 @@ import (
 var rootPaths = []string{"/var/lib/deis/units", "units"}
 
 // getUnits returns a list of units filtered by target
-func (c *FleetClient) getUnits(target string) (units []string, err error) {
+func (c *FleetClient) Units(target string) (units []string, err error) {
 	allUnits, err := c.Fleet.Units()
 	if err != nil {
 		return
@@ -40,7 +40,7 @@ func (c *FleetClient) getUnits(target string) (units []string, err error) {
 
 // nextUnit returns the next unit number for a given component
 func (c *FleetClient) nextUnit(component string) (num int, err error) {
-	units, err := c.getUnits(component)
+	units, err := c.Units(component)
 	if err != nil {
 		return
 	}
@@ -53,7 +53,7 @@ func (c *FleetClient) nextUnit(component string) (num int, err error) {
 
 // lastUnit returns the last unit number for a given component
 func (c *FleetClient) lastUnit(component string) (num int, err error) {
-	units, err := c.getUnits(component)
+	units, err := c.Units(component)
 	if err != nil {
 		return
 	}