nomad: Adding Eval.Reap

nomad/eval_endpoint.go

@@ -152,3 +152,22 @@ func (e *Eval) Update(args *structs.EvalUpdateRequest,
 	reply.Index = index
 	return nil
 }
+
+// Reap is used to cleanup dead evaluations and allocations
+func (e *Eval) Reap(args *structs.EvalDeleteRequest,
+	reply *structs.GenericResponse) error {
+	if done, err := e.srv.forward("Eval.Reap", args, args, reply); done {
+		return err
+	}
+	defer metrics.MeasureSince([]string{"nomad", "eval", "reap"}, time.Now())
+
+	// Update via Raft
+	_, index, err := e.srv.raftApply(structs.EvalDeleteRequestType, args)
+	if err != nil {
+		return err
+	}
+
+	// Update the index
+	reply.Index = index
+	return nil
+}

nomad/eval_endpoint_test.go

@@ -213,3 +213,36 @@ func TestEvalEndpoint_Update(t *testing.T) {
 		t.Fatalf("Bad: %#v", out)
 	}
 }
+
+func TestEvalEndpoint_Reap(t *testing.T) {
+	s1 := testServer(t, nil)
+	defer s1.Shutdown()
+	codec := rpcClient(t, s1)
+	testutil.WaitForLeader(t, s1.RPC)
+
+	// Create the register request
+	eval1 := mock.Eval()
+	s1.fsm.State().UpsertEvals(1000, []*structs.Evaluation{eval1})
+
+	// Reap the eval
+	get := &structs.EvalDeleteRequest{
+		Evals:        []string{eval1.ID},
+		WriteRequest: structs.WriteRequest{Region: "region1"},
+	}
+	var resp structs.GenericResponse
+	if err := msgpackrpc.CallWithCodec(codec, "Eval.Reap", get, &resp); err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if resp.Index == 0 {
+		t.Fatalf("Bad index: %d", resp.Index)
+	}
+
+	// Ensure deleted
+	outE, err := s1.fsm.State().GetEvalByID(eval1.ID)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if outE != nil {
+		t.Fatalf("Bad: %#v", outE)
+	}
+}