feat(deisctl): add deis/publisher

With this change comes the introduction of the ability to add global
units to the project. Before, we would always prepend "@1" to the units
because we always assumed they'd be scalable. This is not the case for
global units, so I reverted that behaviour.

Author: Matthew Fisher

deisctl/backend/fleet/create.go

@@ -13,6 +13,7 @@ import (
 // and blocks until the unit is loaded
 func (c *FleetClient) Create(targets []string) error {
 	units := make([]*schema.Unit, len(targets))
+	desiredState := string(job.JobStateLoaded)
 	for i, target := range targets {
 		unitName, unitFile, err := c.createUnitFile(target)
 		if err != nil {
@@ -31,13 +32,11 @@ func (c *FleetClient) Create(targets []string) error {
 				return fmt.Errorf("failed creating job %s: %v", unit.Name, err)
 			}
 		}
-		desiredState := string(job.JobStateLoaded)
 		if err := c.Fleet.SetUnitTargetState(unit.Name, desiredState); err != nil {
 			return err
 		}
 	}
 	for _, unit := range units {
-		desiredState := string(job.JobStateLoaded)
 		outchan, errchan := waitForUnitStates([]string{unit.Name}, desiredState)
 		if err := printUnitState(unit.Name, outchan, errchan); err != nil {
 			return err

deisctl/backend/fleet/destroy.go

@@ -11,18 +11,14 @@ import (
 func (c *FleetClient) Destroy(targets []string) error {
 	for _, target := range targets {
 		// check if the unit exists
-		units, err := c.Units(target)
+		_, err := c.Units(target)
 		if err != nil {
 			return err
 		}
 		component, num, err := splitTarget(target)
 		if err != nil {
 			return err
 		}
-		// if no number is specified, destroy ALL THE UNITS!
-		if num == 0 {
-			num = len(units)
-		}
 		if strings.HasSuffix(component, "-data") {
 			err = c.destroyDataUnit(component)
 		} else {
@@ -35,7 +31,7 @@ func (c *FleetClient) Destroy(targets []string) error {
 	return nil
 }
 
-func (c *FleetClient) destroyServiceUnit(component string, num int) (err error) {
+func (c *FleetClient) destroyServiceUnit(component string, num int) error {
 	name, err := formatUnitName(component, num)
 	if err != nil {
 		return err
@@ -46,34 +42,30 @@ func (c *FleetClient) destroyServiceUnit(component string, num int) (err error)
 		return err
 	}
 	outchan, errchan := waitForUnitStates([]string{name}, desiredState)
-	err = printUnitState(name, outchan, errchan)
-	if err != nil {
+	if err := printUnitState(name, outchan, errchan); err != nil {
 		return err
 	}
 	if err = c.Fleet.DestroyUnit(name); err != nil {
 		return fmt.Errorf("failed destroying job %s: %v", name, err)
 	}
-	return err
+	return nil
 }
 
-func (c *FleetClient) destroyDataUnit(component string) (err error) {
+func (c *FleetClient) destroyDataUnit(component string) error {
 	name, err := formatUnitName(component, 0)
+	desiredState := string(job.JobStateInactive)
 	if err != nil {
 		return err
 	}
-	desiredState := string(job.JobStateInactive)
-	err = c.Fleet.SetUnitTargetState(name, desiredState)
-	if err != nil {
+	if err := c.Fleet.SetUnitTargetState(name, desiredState); err != nil {
 		return err
 	}
 	outchan, errchan := waitForUnitStates([]string{name}, desiredState)
-	err = printUnitState(name, outchan, errchan)
-	if err != nil {
+	if err := printUnitState(name, outchan, errchan); err != nil {
 		return err
 	}
-	if err = c.Fleet.DestroyUnit(name); err != nil {
+	if err := c.Fleet.DestroyUnit(name); err != nil {
 		return fmt.Errorf("failed destroying job %s: %v", name, err)
 	}
-	return err
-
+	return nil
 }

deisctl/backend/fleet/state.go

@@ -126,6 +126,11 @@ func assertUnitState(name string, desiredState string, outchan chan *schema.Unit
 	// send unit across the output channel
 	outchan <- u
 
+	// HACK: global units have no soul
+	if u.CurrentState == "" {
+		return true
+	}
+
 	if u.DesiredState == u.CurrentState {
 		return true
 	}
@@ -182,6 +187,10 @@ func printUnitState(name string, outchan chan *schema.Unit, errchan chan error)
 			if u.Name != name {
 				continue
 			}
+			// HACK: global units have no soul
+			if u.CurrentState == "" {
+				continue
+			}
 			// otherwise print output
 			if u.CurrentState != u.DesiredState {
 				fmt.Printf("\033[0;33m%v:\033[0m %v (pending)                       \r",

deisctl/backend/fleet/unit.go

@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
-	"regexp"
 	"strconv"
 	"strings"
 
@@ -25,18 +24,18 @@ func (c *FleetClient) Units(target string) (units []string, err error) {
 	if err != nil {
 		return
 	}
-	var r *regexp.Regexp
 	if strings.HasSuffix(target, "-data") {
-		r = regexp.MustCompile(`deis\-(` + target + `)\.service`)
-	} else if strings.Contains(target, "@") {
-		r = regexp.MustCompile(`deis\-(` + target + `)\.service`)
+		for _, u := range allUnits {
+			if strings.Contains(u.Name, target) {
+				units = []string{u.Name}
+				return
+			}
+		}
 	} else {
-		r = regexp.MustCompile(`deis\-(` + target + `)@([\d]+)\.service`)
-	}
-	for _, u := range allUnits {
-		match := r.MatchString(u.Name)
-		if match {
-			units = append(units, u.Name)
+		for _, u := range allUnits {
+			if strings.Contains(u.Name, target) && !strings.HasSuffix(u.Name, "-data.service") {
+				units = append(units, u.Name)
+			}
 		}
 	}
 	if len(units) == 0 {

deisctl/cmd/cmd.go

@@ -89,10 +89,10 @@ func startDataContainers(b backend.Backend) error {
 
 func startDefaultServices(b backend.Backend) error {
 	fmt.Println("Launching service containers...")
-	if err := Start(b, []string{"logger"}); err != nil {
+	if err := Start(b, []string{"logger@1"}); err != nil {
 		return err
 	}
-	if err := Start(b, []string{"cache", "router", "database", "controller", "registry", "builder"}); err != nil {
+	if err := Start(b, []string{"publisher", "cache@1", "router@1", "database@1", "controller@1", "registry@1", "builder@1"}); err != nil {
 		return err
 	}
 	fmt.Println("Service containers launched.")
@@ -118,7 +118,7 @@ func StopPlatform(b backend.Backend) error {
 
 func stopDefaultServices(b backend.Backend) error {
 	fmt.Println("Stopping service containers...")
-	if err := Stop(b, []string{"builder", "registry", "controller", "database", "cache", "router", "logger"}); err != nil {
+	if err := Stop(b, []string{"publisher", "builder@1", "registry@1", "controller@1", "database@1", "cache@1", "router@1", "logger@1"}); err != nil {
 		return err
 	}
 	fmt.Println("Service containers stopped.")
@@ -156,13 +156,6 @@ func Install(b backend.Backend, targets []string) error {
 		return InstallPlatform(b)
 	}
 	// otherwise create the specific targets
-	for i, target := range targets {
-		// if we're installing a component without a number attached,
-		// consider the user doesn't know better
-		if !strings.Contains(target, "@") {
-			targets[i] += "@1"
-		}
-	}
 	return b.Create(targets)
 }
 
@@ -197,11 +190,15 @@ func installDefaultServices(b backend.Backend) error {
 		"registry=1",
 		"controller=1",
 		"builder=1",
-		"router=1"}
+		"router=1",
+	}
 	fmt.Println("Scheduling service containers...")
 	if err := Scale(b, targets); err != nil {
 		return err
 	}
+	if err := b.Create([]string{"publisher"}); err != nil {
+		return err
+	}
 	fmt.Println("Service containers scheduled.")
 	return nil
 }
@@ -223,11 +220,17 @@ func uninstallAllServices(b backend.Backend) error {
 		"registry=0",
 		"controller=0",
 		"builder=0",
-		"router=0"}
+		"router=0",
+	}
 	fmt.Println("Destroying service containers...")
-	err := Scale(b, targets)
+	if err := Scale(b, targets); err != nil {
+		return err
+	}
+	if err := b.Destroy([]string{"publisher"}); err != nil {
+		return err
+	}
 	fmt.Println("Service containers destroyed.")
-	return err
+	return nil
 }
 
 func splitScaleTarget(target string) (c string, num int, err error) {
@@ -306,6 +309,7 @@ Options:
 		"deis-database-data.service",
 		"deis-logger.service",
 		"deis-logger-data.service",
+		"deis-publisher.service",
 		"deis-registry.service",
 		"deis-registry-data.service",
 		"deis-router.service",

deisctl/units/deis-publisher.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=deis-publisher
+Requires=docker.socket etcd.service
+After=docker.socket etcd.service
+
+[Service]
+EnvironmentFile=/etc/environment
+TimeoutStartSec=20m
+ExecStartPre=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/publisher`; docker history $IMAGE >/dev/null || docker pull $IMAGE"
+ExecStartPre=/bin/sh -c "docker inspect deis-logger >/dev/null && docker rm -f deis-publisher || true"
+ExecStart=/bin/sh -c "IMAGE=`/run/deis/bin/get_image /deis/publisher` && docker run --name deis-publisher --rm -e HOST=$COREOS_PRIVATE_IPV4 -e ETCD_HOST=$COREOS_PRIVATE_IPV4 -v /var/run/docker.sock:/var/run/docker.sock $IMAGE"
+ExecStopPost=/usr/bin/docker stop deis-logger
+
+[Install]
+WantedBy=multi-user.target
+
+[X-Fleet]
+Global=true