Move execution request map to runners
This commit is contained in:
@@ -3,12 +3,20 @@ package runner
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"github.com/google/uuid"
|
||||
"gitlab.hpi.de/codeocean/codemoon/poseidon/api/dto"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// Status is the type for the status of a Runner.
|
||||
type Status string
|
||||
|
||||
// ContextKey is the type for keys in a request context.
|
||||
type ContextKey string
|
||||
|
||||
// ExecutionId is an id for a execution in a Runner.
|
||||
type ExecutionId string
|
||||
|
||||
const (
|
||||
StatusReady Status = "ready"
|
||||
StatusRunning Status = "running"
|
||||
@@ -20,32 +28,48 @@ const (
|
||||
)
|
||||
|
||||
type Runner interface {
|
||||
// SetStatus sets the status of the runner.
|
||||
SetStatus(Status)
|
||||
|
||||
// Status gets the status of the runner.
|
||||
Status() Status
|
||||
|
||||
// Id returns the id of the runner.
|
||||
Id() string
|
||||
|
||||
// Execution looks up an ExecutionId for the runner and returns the associated RunnerRequest.
|
||||
// If this request does not exits, ok is false, else true.
|
||||
Execution(ExecutionId) (request dto.ExecutionRequest, ok bool)
|
||||
|
||||
// AddExecution saves the supplied ExecutionRequest for the runner and returns an ExecutionId to retrieve it again.
|
||||
AddExecution(dto.ExecutionRequest) (ExecutionId, error)
|
||||
|
||||
// DeleteExecution deletes the execution of the runner with the specified id.
|
||||
DeleteExecution(ExecutionId)
|
||||
}
|
||||
|
||||
// ExerciseRunner is an abstraction to communicate with Nomad allocations
|
||||
// ExerciseRunner is an abstraction to communicate with Nomad allocations.
|
||||
type ExerciseRunner struct {
|
||||
sync.Mutex
|
||||
id string
|
||||
status Status
|
||||
ch chan bool
|
||||
id string
|
||||
status Status
|
||||
ch chan bool
|
||||
executions map[ExecutionId]dto.ExecutionRequest
|
||||
}
|
||||
|
||||
// NewExerciseRunner creates a new exercise runner with the provided id
|
||||
// As default value the status is ready
|
||||
// NewExerciseRunner creates a new exercise runner with the provided id.
|
||||
func NewExerciseRunner(id string) *ExerciseRunner {
|
||||
return &ExerciseRunner{
|
||||
id: id,
|
||||
status: StatusReady,
|
||||
Mutex: sync.Mutex{},
|
||||
ch: make(chan bool),
|
||||
id: id,
|
||||
status: StatusReady,
|
||||
Mutex: sync.Mutex{},
|
||||
ch: make(chan bool),
|
||||
executions: make(map[ExecutionId]dto.ExecutionRequest),
|
||||
}
|
||||
}
|
||||
|
||||
// MarshalJSON implements json.Marshaler interface
|
||||
// This exports also private attributes like the id
|
||||
// MarshalJSON implements json.Marshaler interface.
|
||||
// This exports private attributes like the id too.
|
||||
func (r *ExerciseRunner) MarshalJSON() ([]byte, error) {
|
||||
return json.Marshal(struct {
|
||||
Id string `json:"runnerId"`
|
||||
@@ -56,29 +80,53 @@ func (r *ExerciseRunner) MarshalJSON() ([]byte, error) {
|
||||
})
|
||||
}
|
||||
|
||||
// SetStatus sets the status thread-safe
|
||||
func (r *ExerciseRunner) SetStatus(status Status) {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
r.status = status
|
||||
}
|
||||
|
||||
// Status returns the status thread-safe
|
||||
func (r *ExerciseRunner) Status() Status {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
return r.status
|
||||
}
|
||||
|
||||
// Id returns the id of the runner
|
||||
func (r *ExerciseRunner) Id() string {
|
||||
return r.id
|
||||
}
|
||||
|
||||
func (r *ExerciseRunner) Execution(id ExecutionId) (executionRequest dto.ExecutionRequest, ok bool) {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
executionRequest, ok = r.executions[id]
|
||||
return
|
||||
}
|
||||
|
||||
func (r *ExerciseRunner) AddExecution(request dto.ExecutionRequest) (ExecutionId, error) {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
idUuid, err := uuid.NewRandom()
|
||||
if err != nil {
|
||||
return ExecutionId(""), err
|
||||
}
|
||||
id := ExecutionId(idUuid.String())
|
||||
r.executions[id] = request
|
||||
return id, err
|
||||
}
|
||||
|
||||
func (r *ExerciseRunner) DeleteExecution(id ExecutionId) {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
delete(r.executions, id)
|
||||
}
|
||||
|
||||
// NewContext creates a context containing a runner.
|
||||
func NewContext(ctx context.Context, runner Runner) context.Context {
|
||||
return context.WithValue(ctx, runnerContextKey, runner)
|
||||
}
|
||||
|
||||
// FromContext returns a runner from a context.
|
||||
func FromContext(ctx context.Context) (Runner, bool) {
|
||||
runner, ok := ctx.Value(runnerContextKey).(Runner)
|
||||
return runner, ok
|
||||
|
Reference in New Issue
Block a user