From bb3b26340d0cbcdba65c8d99bbfd00a9db9ae937 Mon Sep 17 00:00:00 2001 From: Renan DelValle Date: Wed, 24 Aug 2016 17:21:59 -0700 Subject: [PATCH] Ran go fmt on project. Changed FechTaskConfig to only fetch configurations in an existing state --- examples/client.go | 4 ++-- realis.go | 6 +++--- updatejob.go | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/client.go b/examples/client.go index 15f85f2..954a54d 100644 --- a/examples/client.go +++ b/examples/client.go @@ -43,8 +43,8 @@ func main() { os.Exit(1) } - cluster, ok := clusters[*clusterName]; - if(!ok) { + cluster, ok := clusters[*clusterName] + if !ok { fmt.Printf("Cluster %s chosen doesn't exist\n", *clusterName) os.Exit(1) } diff --git a/realis.go b/realis.go index 92cfd5b..1cb1655 100644 --- a/realis.go +++ b/realis.go @@ -238,17 +238,17 @@ func (r realisClient) FetchTaskConfig(instKey aurora.InstanceKey) (*aurora.TaskC taskQ := &aurora.TaskQuery{Role: instKey.JobKey.Role, Environment: instKey.JobKey.Environment, JobName: instKey.JobKey.Name, - InstanceIds: ids, } + InstanceIds: ids, + Statuses: aurora.ACTIVE_STATES} response, err := r.client.GetTasksStatus(taskQ) if err != nil { return nil, errors.Wrap(err, "Error querying Aurora Scheduler for task configuration") } - tasks := response.GetResult_().GetScheduleStatusResult_().GetTasks() - if(len(tasks) == 0) { + if len(tasks) == 0 { return nil, errors.Errorf("Instance %d for jobkey %s/%s/%s doesn't exist", instKey.InstanceId, instKey.JobKey.Environment, diff --git a/updatejob.go b/updatejob.go index 2b0770c..e222485 100644 --- a/updatejob.go +++ b/updatejob.go @@ -21,7 +21,7 @@ import ( // Structure to collect all information required to create job update type UpdateJob struct { Job // SetInstanceCount for job is hidden, access via full qualifier - req *aurora.JobUpdateRequest + req *aurora.JobUpdateRequest } // Create a default UpdateJob object. @@ -36,17 +36,17 @@ func NewUpdateJob(config *aurora.TaskConfig) *UpdateJob { // Rebuild resource map from TaskConfig for ptr := range config.Resources { - if(ptr.NumCpus != nil){ + if ptr.NumCpus != nil { job.resources["cpu"].NumCpus = ptr.NumCpus continue // Guard against Union violations that Go won't enforce } - if(ptr.RamMb != nil){ + if ptr.RamMb != nil { job.resources["ram"].RamMb = ptr.RamMb continue } - if(ptr.DiskMb != nil){ + if ptr.DiskMb != nil { job.resources["disk"].DiskMb = ptr.DiskMb continue }