Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replacing SubmitJob with SubmitJobs #224

Merged
merged 11 commits into from
Nov 5, 2019
Merged

Replacing SubmitJob with SubmitJobs #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c12236d
Replacing SubmitJob with SubmitJobs
JamesMurkin Nov 4, 2019
ae1a6f0
Updating client code (armadactl/armada-load-tester) to submit in bulk
JamesMurkin Nov 4, 2019
616b208
Merge branch 'master' into bulk-submit
JamesMurkin Nov 4, 2019
55a0523
Correcting submit_test
JamesMurkin Nov 4, 2019
069a24c
Adding tests to confirm submit maintain order on client/server
JamesMurkin Nov 4, 2019
7754845
Merge branch 'master' into bulk-submit
JamesMurkin Nov 4, 2019
736ce1f
Updating job submission yaml files to new structure
JamesMurkin Nov 4, 2019
e1da201
Making AddJobs return an array rather than map, to maintain ordering …
JamesMurkin Nov 5, 2019
d1a905f
Updating client validation testdata file formats
JamesMurkin Nov 5, 2019
55a235e
Fixing test
JamesMurkin Nov 5, 2019
82a7b88
Removing client service package
JamesMurkin Nov 5, 2019
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
3 changes: 1 addition & 2 deletions cmd/armada-load-tester/cmd/loadtest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/G-Research/armada/internal/client"
"github.com/G-Research/armada/internal/client/domain"
"github.com/G-Research/armada/internal/client/service"
"github.com/G-Research/armada/internal/client/util"
)

Expand Down Expand Up @@ -65,7 +64,7 @@ var loadtestCmd = &cobra.Command{

watchEvents := viper.GetBool("watch")
apiConnectionDetails := client.ExtractCommandlineArmadaApiConnectionDetails()
loadTester := service.NewArmadaLoadTester(apiConnectionDetails)
loadTester := client.NewArmadaLoadTester(apiConnectionDetails)

loadTester.RunSubmissionTest(*loadTestSpec, watchEvents)
},
Expand Down
3 changes: 1 addition & 2 deletions cmd/armadactl/cmd/analyze.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/G-Research/armada/internal/armada/api"
"github.com/G-Research/armada/internal/client"
"github.com/G-Research/armada/internal/client/domain"
"github.com/G-Research/armada/internal/client/service"
"github.com/G-Research/armada/internal/client/util"
)

Expand Down Expand Up @@ -40,7 +39,7 @@ var analyzeCmd = &cobra.Command{
events := map[string][]*api.Event{}
var jobState *domain.WatchContext

service.WatchJobSet(eventsClient, jobSetId, false, context.Background(), func(state *domain.WatchContext, e api.Event) bool {
client.WatchJobSet(eventsClient, jobSetId, false, context.Background(), func(state *domain.WatchContext, e api.Event) bool {
events[e.GetJobId()] = append(events[e.GetJobId()], &e)
jobState = state
return false
Expand Down
5 changes: 2 additions & 3 deletions cmd/armadactl/cmd/createQueue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (

"github.com/G-Research/armada/internal/armada/api"
"github.com/G-Research/armada/internal/client"
"github.com/G-Research/armada/internal/client/service"
"github.com/G-Research/armada/internal/client/util"
)

Expand Down Expand Up @@ -41,8 +40,8 @@ Job priority is evaluated inside queue, queue has its own priority.`,
apiConnectionDetails := client.ExtractCommandlineArmadaApiConnectionDetails()

util.WithConnection(apiConnectionDetails, func(conn *grpc.ClientConn) {
client := api.NewSubmitClient(conn)
e := service.CreateQueue(client, &api.Queue{
submissionClient := api.NewSubmitClient(conn)
e := client.CreateQueue(submissionClient, &api.Queue{
Name: queue,
PriorityFactor: priority,
UserOwners: owners,
Expand Down
26 changes: 20 additions & 6 deletions cmd/armadactl/cmd/submit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

"github.com/G-Research/armada/internal/armada/api"
"github.com/G-Research/armada/internal/client"
"github.com/G-Research/armada/internal/client/service"
"github.com/G-Research/armada/internal/client/util"
"github.com/G-Research/armada/internal/client/validation"
)
Expand All @@ -20,7 +19,9 @@ func init() {
}

type JobSubmitFile struct {
Jobs []*api.JobRequest `json:"jobs"`
Queue string
JobSetId string
Jobs []*api.JobSubmitRequestItem `json:"jobs"`
}

var submitCmd = &cobra.Command{
Expand Down Expand Up @@ -63,17 +64,30 @@ var submitCmd = &cobra.Command{

apiConnectionDetails := client.ExtractCommandlineArmadaApiConnectionDetails()

requests := client.CreateChunkedSubmitRequests(submitFile.Queue, submitFile.JobSetId, submitFile.Jobs)

util.WithConnection(apiConnectionDetails, func(conn *grpc.ClientConn) {
client := api.NewSubmitClient(conn)
for _, job := range submitFile.Jobs {
response, e := service.SubmitJob(client, job)
submissionClient := api.NewSubmitClient(conn)
for _, request := range requests {
response, e := client.SubmitJobs(submissionClient, request)

if e != nil {
log.Error(e)
os.Exit(1)
}
log.Infof("Submitted job id: %s (set: %s)", response.JobId, job.JobSetId)

summariseResponse(response, request.JobSetId)
}
})
},
}

func summariseResponse(response *api.JobSubmitResponse, jobSetId string) {
for _, jobResponseItem := range response.JobResponseItems {
if jobResponseItem.Error != "" {
log.Errorf("Failed to submit job because: %s", jobResponseItem.Error)
} else {
log.Infof("Submitted job id: %s (set: %s)", jobResponseItem.JobId, jobSetId)
}
}
}
3 changes: 1 addition & 2 deletions cmd/armadactl/cmd/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"github.com/G-Research/armada/internal/armada/api"
"github.com/G-Research/armada/internal/client"
"github.com/G-Research/armada/internal/client/domain"
"github.com/G-Research/armada/internal/client/service"
"github.com/G-Research/armada/internal/client/util"
)

Expand All @@ -40,7 +39,7 @@ var watchCmd = &cobra.Command{

util.WithConnection(apiConnectionDetails, func(conn *grpc.ClientConn) {
eventsClient := api.NewEventClient(conn)
service.WatchJobSet(eventsClient, jobSetId, true, context.Background(), func(state *domain.WatchContext, e api.Event) bool {
client.WatchJobSet(eventsClient, jobSetId, true, context.Background(), func(state *domain.WatchContext, e api.Event) bool {
if raw {
data, err := json.Marshal(e)
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions docs/production-install.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ openIdConnect:

For more information about usage please see the [User Guide](./user.md)

Describe jobs in yaml file:
Specify the jobs to be submitted in a yaml file:
```yaml
queue: test
jobSetId: job-set-1
jobs:
- queue: test
priority: 0
jobSetId: job-set-1
- priority: 0
podSpec:
terminationGracePeriodSeconds: 0
restartPolicy: Never
Expand Down
6 changes: 3 additions & 3 deletions docs/quickstart/job-queue-a.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
queue: queue-a
jobSetId: job-set-1
jobs:
- queue: queue-a
priority: 0
jobSetId: job-set-1
- priority: 0
podSpec:
terminationGracePeriodSeconds: 0
restartPolicy: Never
Expand Down
6 changes: 3 additions & 3 deletions docs/quickstart/job-queue-b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
queue: queue-b
jobSetId: job-set-1
jobs:
- queue: queue-b
priority: 0
jobSetId: job-set-1
- priority: 0
podSpec:
terminationGracePeriodSeconds: 0
restartPolicy: Never
Expand Down
40 changes: 22 additions & 18 deletions e2e/test/basic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"k8s.io/apimachinery/pkg/api/resource"

"github.com/G-Research/armada/internal/armada/api"
"github.com/G-Research/armada/internal/client"
"github.com/G-Research/armada/internal/client/domain"
"github.com/G-Research/armada/internal/client/service"
util2 "github.com/G-Research/armada/internal/client/util"
"github.com/G-Research/armada/internal/common/util"
)
Expand All @@ -33,10 +33,10 @@ func TestCanSubmitJob_ReceivingAllExpectedEvents(t *testing.T) {
util2.WithConnection(connectionDetails, func(connection *grpc.ClientConn) {
submitClient := api.NewSubmitClient(connection)

err := service.CreateQueue(submitClient, &api.Queue{Name: jobRequest.Queue, PriorityFactor: 1})
err := client.CreateQueue(submitClient, &api.Queue{Name: jobRequest.Queue, PriorityFactor: 1})
assert.Nil(t, err)

_, err = service.SubmitJob(submitClient, jobRequest)
_, err = client.SubmitJobs(submitClient, jobRequest)
assert.Nil(t, err)

receivedEvents := make(map[domain.JobStatus]bool)
Expand All @@ -45,7 +45,7 @@ func TestCanSubmitJob_ReceivingAllExpectedEvents(t *testing.T) {

timeout, _ := context.WithTimeout(context.Background(), 30*time.Second)

service.WatchJobSet(eventsClient, jobRequest.JobSetId, true, timeout, func(state *domain.WatchContext, e api.Event) bool {
client.WatchJobSet(eventsClient, jobRequest.JobSetId, true, timeout, func(state *domain.WatchContext, e api.Event) bool {
currentStatus := state.GetJobInfo(e.GetJobId()).Status
receivedEvents[currentStatus] = true

Expand Down Expand Up @@ -89,24 +89,28 @@ func hasTimedOut(context context.Context) bool {
}
}

func createJobRequest() *api.JobRequest {
func createJobRequest() *api.JobSubmitRequest {
cpu, _ := resource.ParseQuantity("80m")
memory, _ := resource.ParseQuantity("50Mi")
return &api.JobRequest{
PodSpec: &v1.PodSpec{
Containers: []v1.Container{{
Name: "container1",
Image: "alpine:3.10",
Args: []string{"sleep", "5s"},
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{"cpu": cpu, "memory": memory},
Limits: v1.ResourceList{"cpu": cpu, "memory": memory},
return &api.JobSubmitRequest{
Queue: "test",
JobSetId: util.NewULID(),
JobRequestItems: []*api.JobSubmitRequestItem{
{
PodSpec: &v1.PodSpec{
Containers: []v1.Container{{
Name: "container1",
Image: "alpine:3.10",
Args: []string{"sleep", "5s"},
Resources: v1.ResourceRequirements{
Requests: v1.ResourceList{"cpu": cpu, "memory": memory},
Limits: v1.ResourceList{"cpu": cpu, "memory": memory},
},
},
},
},
},
Priority: 0,
},
},
JobSetId: util.NewULID(),
Priority: 0,
Queue: "test",
}
}
6 changes: 3 additions & 3 deletions example/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
queue: test
jobSetId: job-set-1
jobs:
- queue: test
priority: 0
jobSetId: job-set-1
- priority: 0
podSpec:
terminationGracePeriodSeconds: 0
restartPolicy: Never
Expand Down
Loading