Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs
/resources/resource_fs.go
__pycache__
.optimus.yaml
coverage.txt

# git ignore generate files related to gRPC and proto
/proton/
Expand Down
58 changes: 44 additions & 14 deletions api/handler/v1/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,44 @@ func (sv *RuntimeServiceServer) ListResourceSpecification(ctx context.Context, r
}, nil
}

func (sv *RuntimeServiceServer) ReplayDryRun(ctx context.Context, req *pb.ReplayDryRunRequest) (*pb.ReplayDryRunResponse, error) {
func (sv *RuntimeServiceServer) ReplayDryRun(ctx context.Context, req *pb.ReplayRequest) (*pb.ReplayDryRunResponse, error) {
replayWorkerRequest, err := sv.parseReplayRequest(req)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while parsing replay dry run request: %v", err))
}

rootNode, err := sv.jobSvc.ReplayDryRun(replayWorkerRequest)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while processing replay dry run: %v", err))
}

node, err := sv.adapter.ToReplayExecutionTreeNode(rootNode)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while preparing replay dry run response: %v", err))
}
return &pb.ReplayDryRunResponse{
Success: true,
Response: node,
}, nil
}

func (sv *RuntimeServiceServer) Replay(ctx context.Context, req *pb.ReplayRequest) (*pb.ReplayResponse, error) {
replayWorkerRequest, err := sv.parseReplayRequest(req)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while parsing replay request: %v", err))
}

replayUUID, err := sv.jobSvc.Replay(replayWorkerRequest)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while processing replay: %v", err))
}

return &pb.ReplayResponse{
Id: replayUUID,
}, nil
}

func (sv *RuntimeServiceServer) parseReplayRequest(req *pb.ReplayRequest) (*models.ReplayWorkerRequest, error) {
projectRepo := sv.projectRepoFactory.New()
projSpec, err := projectRepo.GetByName(req.GetProjectName())
if err != nil {
Expand Down Expand Up @@ -760,20 +797,13 @@ func (sv *RuntimeServiceServer) ReplayDryRun(ctx context.Context, req *pb.Replay
if endDate.Before(startDate) {
return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("replay end date cannot be before start date"))
}

rootNode, err := sv.jobSvc.ReplayDryRun(namespaceSpec, jobSpec, startDate, endDate)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while processing replay: %v", err))
}

node, err := sv.adapter.ToReplayExecutionTreeNode(rootNode)
if err != nil {
return nil, status.Error(codes.Internal, fmt.Sprintf("error while processing replay: %v", err))
replayRequest := models.ReplayWorkerRequest{
Job: jobSpec,
Start: startDate,
End: endDate,
Project: projSpec,
}
return &pb.ReplayDryRunResponse{
Success: true,
Response: node,
}, nil
return &replayRequest, nil
}

func NewRuntimeServiceServer(
Expand Down
10 changes: 8 additions & 2 deletions api/handler/v1/runtime_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1479,11 +1479,17 @@ func TestRuntimeServiceServer(t *testing.T) {
},
}),
}
replayWorkerRequest := &models.ReplayWorkerRequest{
Job: jobSpec,
Start: startDate,
End: endDate,
Project: projectSpec,
}
dagNode := tree.NewTreeNode(jobSpec)

jobService := new(mock.JobService)
jobService.On("GetByName", jobName, namespaceSpec).Return(jobSpec, nil)
jobService.On("ReplayDryRun", namespaceSpec, jobSpec, startDate, endDate).Return(dagNode, nil)
jobService.On("ReplayDryRun", replayWorkerRequest).Return(dagNode, nil)
defer jobService.AssertExpectations(t)

projectRepository := new(mock.ProjectRepository)
Expand Down Expand Up @@ -1514,7 +1520,7 @@ func TestRuntimeServiceServer(t *testing.T) {
nil,
nil,
)
replayRequest := pb.ReplayDryRunRequest{
replayRequest := pb.ReplayRequest{
ProjectName: projectName,
Namespace: namespaceSpec.Name,
JobName: jobName,
Expand Down
754 changes: 413 additions & 341 deletions api/proto/odpf/optimus/runtime_service.pb.go

Large diffs are not rendered by default.

141 changes: 139 additions & 2 deletions api/proto/odpf/optimus/runtime_service.pb.gw.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading