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

Merge pull request #27 from smothiki/nilcheck

Browse source 
check if the resposne schedule result is nil
This commit is contained in:
kkrishna 2017-06-05 15:54:14 -07:00 • committed by GitHub
commit dd334d3a08
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
realis.go
View file

@ -528,19 +528,20 @@ func (r *realisClient) GetInstanceIds(key *aurora.JobKey, states map[aurora.Sche
fmt.Println("error in ReestablishConn: ", err1) fmt.Println("error in ReestablishConn: ", err1)
} }
} }
if err != nil { if err != nil {
return nil, errors.Wrap(err, "Error querying Aurora Scheduler for active IDs") return nil, errors.Wrap(err, "Error querying Aurora Scheduler for active IDs")
} }
resp, err = response.ResponseCodeCheck(resp)
if err != nil {
return nil, err
}
tasks := response.ScheduleStatusResult(resp).GetTasks() tasks := response.ScheduleStatusResult(resp).GetTasks()
jobInstanceIds := make(map[int32]bool) jobInstanceIds := make(map[int32]bool)
for _, task := range tasks { for _, task := range tasks {
jobInstanceIds[task.GetAssignedTask().GetInstanceId()] = true jobInstanceIds[task.GetAssignedTask().GetInstanceId()] = true
} }
return jobInstanceIds, nil return jobInstanceIds, nil
} }
func (r *realisClient) GetJobUpdateSummaries(jobUpdateQuery *aurora.JobUpdateQuery) (*aurora.Response, error) { func (r *realisClient) GetJobUpdateSummaries(jobUpdateQuery *aurora.JobUpdateQuery) (*aurora.Response, error) {

8
response/response.go
View file

@ -17,8 +17,9 @@ package response
import ( import (
"bytes" "bytes"
"github.com/rdelval/gorealis/gen-go/apache/aurora"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rdelval/gorealis/gen-go/apache/aurora"
) )
// Get key from a response created by a StartJobUpdate call // Get key from a response created by a StartJobUpdate call
@ -35,6 +36,9 @@ func ScheduleStatusResult(resp *aurora.Response) *aurora.ScheduleStatusResult_ {
} }
func ResponseCodeCheck(resp *aurora.Response) (*aurora.Response, error) { func ResponseCodeCheck(resp *aurora.Response) (*aurora.Response, error) {
if resp == nil {
return resp, errors.New("Got nil Response")
}
if resp.GetResponseCode() != aurora.ResponseCode_OK { if resp.GetResponseCode() != aurora.ResponseCode_OK {
return resp, errors.New(CombineMessage(resp)) return resp, errors.New(CombineMessage(resp))
} }
@ -50,7 +54,7 @@ func CombineMessage(resp *aurora.Response) string {
} }
if buffer.Len() > 0 { if buffer.Len() > 0 {
buffer.Truncate(buffer.Len()-2) // Get rid of trailing comma + space buffer.Truncate(buffer.Len() - 2) // Get rid of trailing comma + space
} }
return buffer.String() return buffer.String()
} }