ridv/gorealis-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases 13 Packages Wiki Activity Actions

Splitting off Aurora task from Aurora Job since Update mechanism only needs task.

Browse source
This commit is contained in:
Renan DelValle 2018-12-10 18:57:16 -08:00
parent b0c25e9013
commit 5836ede37b
No known key found for this signature in database
GPG key ID: C240AD6D6F443EC9
4 changed files with 312 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

30
jobupdate.go
View file

@ -20,31 +20,31 @@ import (
// Structure to collect all information required to create job update
type JobUpdate struct {
Job *AuroraJob
Task *Task
request *aurora.JobUpdateRequest
}
// Create a default JobUpdate object.
func NewDefaultJobUpdate(job *AuroraJob) *JobUpdate {
func NewDefaultJobUpdate(task *Task) *JobUpdate {
req := aurora.JobUpdateRequest{}
req.TaskConfig = job.jobConfig.TaskConfig
req.TaskConfig = task.task
req.Settings = NewUpdateSettings()
// Rebuild resource map from TaskConfig
for _, ptr := range job.jobConfig.TaskConfig.Resources {
for _, ptr := range task.task.Resources {
if ptr.NumCpus != nil {
job.resources["cpu"].NumCpus = ptr.NumCpus
task.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
task.resources["ram"].RamMb = ptr.RamMb
continue
}
if ptr.DiskMb != nil {
job.resources["disk"].DiskMb = ptr.DiskMb
task.resources["disk"].DiskMb = ptr.DiskMb
continue
}
}
@ -58,8 +58,8 @@ func NewDefaultJobUpdate(job *AuroraJob) *JobUpdate {
req.Settings.MaxFailedInstances = 0
req.Settings.RollbackOnFailure = true
//TODO(rdelvalle): Deep copy job struct to avoid unexpected behavior
return &JobUpdate{Job: job, request: &req}
//TODO(rdelvalle): Deep copy task struct to avoid unexpected behavior
return &JobUpdate{Task: task, request: &req}
}
func NewUpdateJob(config *aurora.TaskConfig, settings *aurora.JobUpdateSettings) *JobUpdate {
@ -68,29 +68,29 @@ func NewUpdateJob(config *aurora.TaskConfig, settings *aurora.JobUpdateSettings)
req.TaskConfig = config
req.Settings = settings
job := NewJob()
job.jobConfig.TaskConfig = config
task := NewTask()
task.task = config
// Rebuild resource map from TaskConfig
for _, ptr := range config.Resources {
if ptr.NumCpus != nil {
job.resources["cpu"].NumCpus = ptr.NumCpus
task.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
task.resources["ram"].RamMb = ptr.RamMb
continue
}
if ptr.DiskMb != nil {
job.resources["disk"].DiskMb = ptr.DiskMb
task.resources["disk"].DiskMb = ptr.DiskMb
continue
}
}
//TODO(rdelvalle): Deep copy job struct to avoid unexpected behavior
return &JobUpdate{Job: job, request: req}
return &JobUpdate{Task: task, request: req}
}
// Set instance count the job will have after the update.