Added Job interface

job.go

@@ -19,17 +19,39 @@ import (
 	"strconv"
 )
 
+type Job interface {
+	// Set Job Key environment.
+	Environment(env string) Job
+	Role(role string) Job
+	Name(name string) Job
+	CPU(cpus float64) Job
+	Disk(disk int64) Job
+	RAM(ram int64) Job
+	ExecutorName(name string) Job
+	ExecutorData(data string) Job
+	AddPorts(num int) Job
+	AddLabel(key string, value string) Job
+	AddNamedPorts(names ...string) Job
+	AddLimitConstraint(name string, limit int32) Job
+	AddValueConstraint(name string, negated bool, values ...string) Job
+	AddURIs(extract bool, cache bool, values ...string) Job
+	JobKey() *aurora.JobKey
+	JobConfig() *aurora.JobConfiguration
+	TaskConfig() *aurora.TaskConfig
+	IsService(isService bool) Job
+	InstanceCount(instCount int32) Job
+	MaxFailure(maxFail int32) Job
+}
+
 // Structure to collect all information pertaining to an Aurora job.
-type Job struct {
+type AuroraJob struct {
 	jobConfig *aurora.JobConfiguration
-	numCpus   *aurora.Resource
+	resources map[string]*aurora.Resource
-	ramMb     *aurora.Resource
-	diskMb    *aurora.Resource
 	portCount int
 }
 
 // Create a Job object with everything initialized.
-func NewJob() *Job {
+func NewJob() Job {
 	jobConfig := aurora.NewJobConfiguration()
 	taskConfig := aurora.NewTaskConfig()
 	jobKey := aurora.NewJobKey()
@@ -52,135 +74,149 @@ func NewJob() *Job {
 	ramMb := aurora.NewResource()
 	diskMb := aurora.NewResource()
 
+	resources := make(map[string]*aurora.Resource)
+	resources["cpu"] = numCpus
+	resources["ram"] = ramMb
+	resources["disk"] = diskMb
+
 	taskConfig.Resources = make(map[*aurora.Resource]bool)
 	taskConfig.Resources[numCpus] = true
 	taskConfig.Resources[ramMb] = true
 	taskConfig.Resources[diskMb] = true
 
-	return &Job{jobConfig, numCpus, ramMb, diskMb, 0}
+	return AuroraJob{jobConfig, resources, 0}
 }
 
 // Set Job Key environment.
-func (a *Job) Environment(env string) *Job {
+func (j AuroraJob) Environment(env string) Job {
-	a.jobConfig.Key.Environment = env
+	j.jobConfig.Key.Environment = env
-	return a
+	return j
 }
 
 // Set Job Key Role.
-func (a *Job) Role(role string) *Job {
+func (j AuroraJob) Role(role string) Job {
-	a.jobConfig.Key.Role = role
+	j.jobConfig.Key.Role = role
 
 	//Will be deprecated
 	identity := &aurora.Identity{role}
-	a.jobConfig.Owner = identity
+	j.jobConfig.Owner = identity
-	a.jobConfig.TaskConfig.Owner = identity
+	j.jobConfig.TaskConfig.Owner = identity
-	return a
+	return j
 }
 
 // Set Job Key Name.
-func (a *Job) Name(name string) *Job {
+func (j AuroraJob) Name(name string) Job {
-	a.jobConfig.Key.Name = name
+	j.jobConfig.Key.Name = name
-	return a
+	return j
 }
 
 // Set name of the executor that will the task will be configured to.
-func (a *Job) ExecutorName(name string) *Job {
+func (j AuroraJob) ExecutorName(name string) Job {
-	a.jobConfig.TaskConfig.ExecutorConfig.Name = name
+	j.jobConfig.TaskConfig.ExecutorConfig.Name = name
-	return a
+	return j
 }
 
 // Will be included as part of entire task inside the scheduler that will be serialized.
-func (a *Job) ExecutorData(data string) *Job {
+func (j AuroraJob) ExecutorData(data string) Job {
-	a.jobConfig.TaskConfig.ExecutorConfig.Data = data
+	j.jobConfig.TaskConfig.ExecutorConfig.Data = data
-	return a
+	return j
 }
 
-func (a *Job) CPU(cpus float64) *Job {
+func (j AuroraJob) CPU(cpus float64) Job {
-	a.numCpus.NumCpus = &cpus
+	j.resources["cpu"].NumCpus = &cpus
-	a.jobConfig.TaskConfig.NumCpus = cpus //Will be deprecated soon
+	j.jobConfig.TaskConfig.NumCpus = cpus //Will be deprecated soon
 
-	return a
+	return j
 }
 
-func (a *Job) RAM(ram int64) *Job {
+func (j AuroraJob) RAM(ram int64) Job {
-	a.ramMb.RamMb = &ram
+	j.resources["ram"].RamMb = &ram
-	a.jobConfig.TaskConfig.RamMb = ram //Will be deprecated soon
+	j.jobConfig.TaskConfig.RamMb = ram //Will be deprecated soon
 
-	return a
+	return j
 }
 
-func (a *Job) Disk(disk int64) *Job {
+func (j AuroraJob) Disk(disk int64) Job {
-	a.diskMb.DiskMb = &disk
+	j.resources["disk"].DiskMb = &disk
-	a.jobConfig.TaskConfig.DiskMb = disk //Will be deprecated
+	j.jobConfig.TaskConfig.DiskMb = disk //Will be deprecated
 
-	return a
+	return j
 }
 
 // How many failures to tolerate before giving up.
-func (a *Job) MaxFailure(maxFail int32) *Job {
+func (j AuroraJob) MaxFailure(maxFail int32) Job {
-	a.jobConfig.TaskConfig.MaxTaskFailures = maxFail
+	j.jobConfig.TaskConfig.MaxTaskFailures = maxFail
-	return a
+	return j
 }
 
 // How many instances of the job to run
-func (a *Job) InstanceCount(instCount int32) *Job {
+func (j AuroraJob) InstanceCount(instCount int32) Job {
-	a.jobConfig.InstanceCount = instCount
+	j.jobConfig.InstanceCount = instCount
-	return a
+	return j
 }
 
 // Restart the job's tasks if they fail
-func (a *Job) IsService(isService bool) *Job {
+func (j AuroraJob) IsService(isService bool) Job {
-	a.jobConfig.TaskConfig.IsService = isService
+	j.jobConfig.TaskConfig.IsService = isService
-	return a
+	return j
 }
 
 // Get the current job configurations key to use for some realis calls.
-func (a *Job) JobKey() *aurora.JobKey {
+func (j AuroraJob) JobKey() *aurora.JobKey {
-	return a.jobConfig.Key
+	return j.jobConfig.Key
+}
+
+// Get the current job configurations key to use for some realis calls.
+func (j AuroraJob) JobConfig() *aurora.JobConfiguration {
+	return j.jobConfig
+}
+
+func (j AuroraJob) TaskConfig() *aurora.TaskConfig {
+	return j.jobConfig.TaskConfig
 }
 
 // Add a list of URIs with the same extract and cache configuration. Scheduler must have
 // --enable_mesos_fetcher flag enabled. Currently there is no duplicate detection.
-func (a *Job) AddURIs(extract bool, cache bool, values ...string) *Job {
+func (j AuroraJob) AddURIs(extract bool, cache bool, values ...string) Job {
 	for _, value := range values {
-		a.jobConfig.
+		j.jobConfig.
 			TaskConfig.
 			MesosFetcherUris[&aurora.MesosFetcherURI{value, &extract, &cache}] = true
 	}
-	return a
+	return j
 }
 
 // Adds a Mesos label to the job. Note that Aurora will add the
 // prefix "org.apache.aurora.metadata." to the beginning of each key.
-func (a *Job) AddLabel(key string, value string) *Job {
+func (j AuroraJob) AddLabel(key string, value string) Job {
-	a.jobConfig.TaskConfig.Metadata[&aurora.Metadata{key, value}] = true
+	j.jobConfig.TaskConfig.Metadata[&aurora.Metadata{key, value}] = true
-	return a
+	return j
 }
 
 // Add a named port to the job configuration  These are random ports as it's
 // not currently possible to request specific ports using Aurora.
-func (a *Job) AddNamedPorts(names ...string) *Job {
+func (j AuroraJob) AddNamedPorts(names ...string) Job {
-	a.portCount += len(names)
+	j.portCount += len(names)
 	for _, name := range names {
-		a.jobConfig.TaskConfig.Resources[&aurora.Resource{NamedPort: &name}] = true
+		j.jobConfig.TaskConfig.Resources[&aurora.Resource{NamedPort: &name}] = true
 	}
 
-	return a
+	return j
 }
 
 // Adds a request for a number of ports to the job configuration. The names chosen for these ports
 // will be org.apache.aurora.port.X, where X is the current port count for the job configuration
 // starting at 0. These are random ports as it's not currently possible to request
 // specific ports using Aurora.
-func (a *Job) AddPorts(num int) *Job {
+func (j AuroraJob) AddPorts(num int) Job {
-	start := a.portCount
+	start := j.portCount
-	a.portCount += num
+	j.portCount += num
-	for i := start; i < a.portCount; i++ {
+	for i := start; i < j.portCount; i++ {
 		portName := "org.apache.aurora.port." + strconv.Itoa(i)
-		a.jobConfig.TaskConfig.Resources[&aurora.Resource{NamedPort: &portName}] = true
+		j.jobConfig.TaskConfig.Resources[&aurora.Resource{NamedPort: &portName}] = true
 	}
 
-	return a
+	return j
 }
 
 // From Aurora Docs:
@@ -188,27 +224,23 @@ func (a *Job) AddPorts(num int) *Job {
 // name - Mesos slave attribute that the constraint is matched against.
 // If negated = true , treat this as a 'not' - to avoid specific values.
 // Values - list of values we look for in attribute name
-func (a *Job) AddValueConstraint(name string,
+func (j AuroraJob) AddValueConstraint(name string, negated bool, values ...string) Job {
-	negated bool,
-	values ...string) *Job {
-
 	constraintValues := make(map[string]bool)
 	for _, value := range values {
 		constraintValues[value] = true
 	}
-	a.jobConfig.TaskConfig.Constraints[&aurora.Constraint{name,
+	j.jobConfig.TaskConfig.Constraints[&aurora.Constraint{name,
 		&aurora.TaskConstraint{&aurora.ValueConstraint{negated, constraintValues}, nil}}] = true
 
-	return a
+	return j
 }
 
 // From Aurora Docs:
 // A constraint that specifies the maximum number of active tasks on a host with
 // a matching attribute that may be scheduled simultaneously.
-func (a *Job) AddLimitConstraint(name string, limit int32) *Job {
+func (j AuroraJob) AddLimitConstraint(name string, limit int32) Job {
-
+	j.jobConfig.TaskConfig.Constraints[&aurora.Constraint{name,
-	a.jobConfig.TaskConfig.Constraints[&aurora.Constraint{name,
 		&aurora.TaskConstraint{nil, &aurora.LimitConstraint{limit}}}] = true
 
-	return a
+	return j
 }

updatejob.go

@@ -16,19 +16,42 @@ package realis
 
 import "gen-go/apache/aurora"
 
-// Structure to collect all information requrired to create job update
+// Structure to collect all information required to create job update
 type UpdateJob struct {
-	*Job // SetInstanceCount for job is hidden, access via full qualifier
+	Job // SetInstanceCount for job is hidden, access via full qualifier
 	req  *aurora.JobUpdateRequest
 }
 
 // Create a default UpdateJob object.
-func NewUpdateJob(job *Job) *UpdateJob {
+func NewUpdateJob(config *aurora.TaskConfig) *UpdateJob {
 
 	req := aurora.NewJobUpdateRequest()
-	req.TaskConfig = job.jobConfig.TaskConfig
+	req.TaskConfig = config
 	req.Settings = aurora.NewJobUpdateSettings()
 
+	job := NewJob().(AuroraJob)
+	job.jobConfig.TaskConfig = config
+
+
+	// Rebuild resource map from TaskConfig
+	job.resources = make(map[string]*aurora.Resource)
+	for ptr := range config.Resources {
+		if(ptr.NumCpus != nil){
+			job.resources["cpu"].NumCpus = ptr.NumCpus
+			continue // Guard against Union violations that Go won't enforce
+		}
+
+		if(ptr.RamMb != nil){
+			job.resources["ram"].RamMb = ptr.RamMb
+			continue
+		}
+
+		if(ptr.DiskMb != nil){
+			job.resources["disk"].DiskMb = ptr.DiskMb
+			continue
+		}
+	}
+
 	// Mirrors defaults set by Pystachio
 	req.Settings.UpdateOnlyTheseInstances = make(map[*aurora.Range]bool)
 	req.Settings.UpdateGroupSize = 1