diff --git a/command/agent/job_endpoint.go b/command/agent/job_endpoint.go index a4be34c25..6fd0814a5 100644 --- a/command/agent/job_endpoint.go +++ b/command/agent/job_endpoint.go @@ -254,7 +254,7 @@ func (s *HTTPServer) jobSummaryRequest(resp http.ResponseWriter, req *http.Reque } var out structs.JobSummaryResponse - if err := s.agent.RPC("Job.GetSummary", &args, &out); err != nil { + if err := s.agent.RPC("Job.Summary", &args, &out); err != nil { return nil, err } diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go index bc39f506b..849e6e426 100644 --- a/nomad/job_endpoint.go +++ b/nomad/job_endpoint.go @@ -113,10 +113,10 @@ func (j *Job) Register(args *structs.JobRegisterRequest, reply *structs.JobRegis return nil } -// GetSummary retreives the summary of a job -func (j *Job) GetSummary(args *structs.JobSummaryRequest, +// Summary retreives the summary of a job +func (j *Job) Summary(args *structs.JobSummaryRequest, reply *structs.JobSummaryResponse) error { - if done, err := j.srv.forward("Job.GetSummary", args, args, reply); done { + if done, err := j.srv.forward("Job.Summary", args, args, reply); done { return err } defer metrics.MeasureSince([]string{"nomad", "job_summary", "get_job_summary"}, time.Now()) diff --git a/nomad/job_endpoint_test.go b/nomad/job_endpoint_test.go index b994216d2..d05785438 100644 --- a/nomad/job_endpoint_test.go +++ b/nomad/job_endpoint_test.go @@ -741,7 +741,7 @@ func TestJobEndpoint_GetJobSummary(t *testing.T) { QueryOptions: structs.QueryOptions{Region: "global"}, } var resp2 structs.JobSummaryResponse - if err := msgpackrpc.CallWithCodec(codec, "Job.GetSummary", get, &resp2); err != nil { + if err := msgpackrpc.CallWithCodec(codec, "Job.Summary", get, &resp2); err != nil { t.Fatalf("err: %v", err) } if resp2.Index != resp.JobModifyIndex { @@ -787,7 +787,7 @@ func TestJobEndpoint_GetJobSummary_Blocking(t *testing.T) { } var resp structs.JobSummaryResponse start := time.Now() - if err := msgpackrpc.CallWithCodec(codec, "Job.GetSummary", req, &resp); err != nil { + if err := msgpackrpc.CallWithCodec(codec, "Job.Summary", req, &resp); err != nil { t.Fatalf("err: %v", err) } if elapsed := time.Since(start); elapsed < 200*time.Millisecond { @@ -813,7 +813,7 @@ func TestJobEndpoint_GetJobSummary_Blocking(t *testing.T) { start = time.Now() var resp1 structs.JobSummaryResponse start = time.Now() - if err := msgpackrpc.CallWithCodec(codec, "Job.GetSummary", req, &resp1); err != nil { + if err := msgpackrpc.CallWithCodec(codec, "Job.Summary", req, &resp1); err != nil { t.Fatalf("err: %v", err) } @@ -838,7 +838,7 @@ func TestJobEndpoint_GetJobSummary_Blocking(t *testing.T) { start = time.Now() var resp2 structs.SingleJobResponse - if err := msgpackrpc.CallWithCodec(codec, "Job.GetSummary", req, &resp2); err != nil { + if err := msgpackrpc.CallWithCodec(codec, "Job.Summary", req, &resp2); err != nil { t.Fatalf("err: %v", err) }