wip

Author: Gabriel Monroy

.gitignore

@@ -1 +1,2 @@
 package/
+deisctl/deisctl

client.go

@@ -8,13 +8,14 @@ import (
 
 	"github.com/coreos/fleet/client"
 	"github.com/coreos/fleet/job"
+	"github.com/coreos/fleet/unit"
 )
 
 // Client interface used to interact with the cluster control plane
 type Client interface {
-	Create(string) error
+	Create(string, bool) error
 	Destroy(string) error
-	Start(string) error
+	Start(string, bool) error
 	Stop(string) error
 	Scale(string, int) error
 	List() error
@@ -38,20 +39,22 @@ func NewClient() (*FleetClient, error) {
 
 // Create schedules a new unit for the given component
 // and blocks until the unit is loaded
-func (c *FleetClient) Create(component string) (err error) {
-	num, err := c.nextUnit(component)
-	if err != nil {
-		return
+func (c *FleetClient) Create(component string, data bool) (err error) {
+	var (
+		unitName string
+		unitPtr *unit.Unit
+	)
+	// create unit
+	if data == true {
+		unitName, unitPtr, err = c.createDataUnit(component)
+	} else {
+		unitName, unitPtr, err = c.createServiceUnit(component)
 	}
-	unitName, err := formatUnitName(component, num)
 	if err != nil {
-		return
-	}
-	unit, err := NewUnit(component)
-	if err != nil {
-		return
+		return err
 	}
-	j := job.NewJob(unitName, *unit)
+	// schedule job
+	j := job.NewJob(unitName, *unitPtr)
 	if err := c.Fleet.CreateJob(j); err != nil {
 		return fmt.Errorf("failed creating job %s: %v", unitName, err)
 	}
@@ -67,6 +70,39 @@ func (c *FleetClient) Create(component string) (err error) {
 	return nil
 }
 
+// Create normal service unit
+func (c *FleetClient) createServiceUnit(component string) (unitName string, unitPtr *unit.Unit, err error) {
+	num, err := c.nextUnit(component)
+	if err != nil {
+		return
+	}
+	unitName, err = formatUnitName(component, num)
+	if err != nil {
+		return
+	}
+	unitPtr, err = NewUnit(component)
+	if err != nil {
+		return
+	}
+	return unitName, unitPtr, nil
+}
+
+// Create data container unit
+func (c *FleetClient) createDataUnit(component string) (unitName string, unitPtr *unit.Unit, err error) {
+	unitName, err = formatUnitName(component, 0)
+	if err != nil {
+		return
+	}
+	randomMachineID(c)
+	unitPtr, err = NewUnit(component)
+	if err != nil {
+		return
+	}
+	return unitName, unitPtr, nil
+
+}
+
+
 // Destroy unschedules one unit for a given component type
 func (c *FleetClient) Destroy(component string) (err error) {
 	num, err := c.lastUnit(component)
@@ -102,19 +138,25 @@ func (c *FleetClient) Scale(component string, num int) (err error) {
 			break
 		}
 		if len(components) < num {
-			c.Create(component)
+			err := c.Create(component, false)
+			if err != nil {
+				return err
+			}
 			continue
 		}
 		if len(components) > num {
-			c.Destroy(component)
+			err := c.Destroy(component)
+			if err != nil {
+				return err
+			}
 			continue
 		}
 	}
 	return
 }
 
 // Start launches target units and blocks until active
-func (c *FleetClient) Start(target string) (err error) {
+func (c *FleetClient) Start(target string, data bool) (err error) {
 	units, err := c.getUnits(target)
 	if err != nil {
 		return
@@ -126,9 +168,11 @@ func (c *FleetClient) Start(target string) (err error) {
 			return err
 		}
 	}
-	errchan := waitForJobStates(c.Fleet, units, testUnitStateActive, 0, os.Stdout)
-	for err := range errchan {
-		return fmt.Errorf("error waiting for active: %v", err)
+	if data == false {
+		errchan := waitForJobStates(c.Fleet, units, testUnitStateActive, 0, os.Stdout)
+		for err := range errchan {
+			return fmt.Errorf("error waiting for active: %v", err)
+		}
 	}
 	return nil
 }

deisctl/deisctl.go

@@ -32,7 +32,7 @@ func cmdScale(c deisctl.Client, targets []string) error {
 
 func cmdStart(c deisctl.Client, targets []string) error {
 	for _, target := range targets {
-		err := c.Start(target)
+		err := c.Start(target, false)
 		if err != nil {
 			return err
 		}
@@ -61,6 +61,28 @@ func cmdStatus(c deisctl.Client, targets []string) error {
 }
 
 func cmdInstall(c deisctl.Client) error {
+	// data containers
+	dataContainers := []string{
+		"database-data",
+		"registry-data",
+		"logger-data",
+		"builder-data",
+	}
+	fmt.Println("Scheduling data containers...")
+	for _, dataContainer := range dataContainers {
+		c.Create(dataContainer, true)
+		// if err != nil {
+		// 	return err
+		// }
+	}
+	fmt.Println("Activating data containers...")
+	for _, dataContainer := range dataContainers {
+		c.Start(dataContainer, true)
+		// if err != nil {
+		// 	return err
+		// }
+	}
+	// start service containers
 	targets := []string{
 		"database=1",
 		"cache=1",

fleet.go

@@ -69,3 +69,17 @@ func getRegistryClient() (client.API, error) {
 	}
 	return client.NewRegistryClient(&trans, Flags.Endpoint, Flags.EtcdKeyPrefix)
 }
+
+
+// randomMachineID return a random machineID from the Fleet cluster
+func randomMachineID(c *FleetClient) (machineID string, err error) {
+	machineState, err := c.Fleet.Machines()
+	if err != nil {
+		return "", err
+	}
+	var machineIDs []string
+	for _, ms := range machineState {
+		machineIDs = append(machineIDs, ms.ID)
+	}
+	return randomValue(machineIDs), nil
+}

unit.go

@@ -27,19 +27,37 @@ func NewUnit(component string) (u *unit.Unit, err error) {
 	return
 }
 
+// NewDataUnit takes a component type and returns a Fleet unit
+// that is hard-scheduled to a machine ID
+func NewDataUnit(component string, machineID string) (u *unit.Unit, err error) {
+	template, err := readTemplate(component)
+	if err != nil {
+		return
+	}
+	// TODO: replace template CHANGEME with machineID
+	u, err = unit.NewUnit(string(template))
+	if err != nil {
+		return
+	}
+	return
+}
+
 // formatUnitName returns a properly formatted systemd service name
 // using the given component type and number
 func formatUnitName(component string, num int) (unitName string, err error) {
-	unitName = "deis-" + component + "." + strconv.Itoa(num) + ".service"
-	return
+	if num == 0 {
+		return "deis-" + component + ".service", nil
+	} else {
+		return "deis-" + component + "." + strconv.Itoa(num) + ".service", nil
+	}
 }
 
 // readTemplate returns the contents of a systemd template for the given component
 func readTemplate(component string) (out []byte, err error) {
 	templateName := "deis-" + component + ".service"
 	var templateFile string
 	for _, rootPath := range rootPaths {
-		filename := path.Join(rootPath, component, templateName)
+		filename := path.Join(rootPath, templateName)
 		if _, err := os.Stat(filename); err == nil {
 			templateFile = filename
 			break