new /api/jobs/ REST endpoint

api/openapi.yaml

@@ -14,6 +14,32 @@ servers:
   - url: /
     description: ''
 paths:
+  '/api/jobs/':
+    get:
+      operationId: 'getJobs'
+      summary: 'List all jobs'
+      description: 'Get a list of all jobs in the JSON schema defined via GraphQL (main difference: start-time is RFC3339 encoded and there are no statistics). Filters can be applied using query parameters.'
+      parameters:
+        - name: state
+          in: query
+          schema:
+            type: string
+            enum: ["running", "completed", "failed", "canceled", "stopped", "timeout"]
+        - name: cluster
+          in: query
+          schema: { type: string }
+      responses:
+        200:
+          description: 'Array of jobs'
+          content:
+            'application/json':
+              schema:
+                type: array
+                items:
+                  # Not totally true: start-time is a RFC3339 string here!
+                  $ref: '#/components/schemas/Job'
+        400:
+          description: 'Bad Request'
   '/api/jobs/{id}':
     get:
       operationId: 'getJob'
@@ -98,12 +124,15 @@ paths:
           'application/json':
             schema:
               type: object
-              required: [jobId, cluster, startTime, stopTime]
+              required: [jobId, cluster, stopTime, jobState]
               properties:
                 jobId: { type: integer }
                 cluster: { type: string }
                 startTime: { type: integer }
                 stopTime: { type: integer }
+                jobState:
+                  type: string
+                  enum: ["running", "completed", "failed", "canceled", "stopped", "timeout"]
       responses:
         200:
           description: 'Job resource'
@@ -131,9 +160,12 @@ paths:
           'application/json':
             schema:
               type: object
-              required: [stopTime]
+              required: [stopTime, jobState]
               properties:
                 stopTime: { type: integer }
+                jobState:
+                  type: string
+                  enum: ["running", "completed", "failed", "canceled", "stopped", "timeout"]
       responses:
         200:
           description: 'Job resource'

api/rest.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"bufio"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -13,6 +14,7 @@ import (
 
 	"github.com/ClusterCockpit/cc-jobarchive/config"
 	"github.com/ClusterCockpit/cc-jobarchive/graph"
+	"github.com/ClusterCockpit/cc-jobarchive/graph/model"
 	"github.com/ClusterCockpit/cc-jobarchive/metricdata"
 	"github.com/ClusterCockpit/cc-jobarchive/schema"
 	sq "github.com/Masterminds/squirrel"
@@ -36,11 +38,14 @@ func (api *RestApi) MountRoutes(r *mux.Router) {
 	r.HandleFunc("/jobs/stop_job/", api.stopJob).Methods(http.MethodPost, http.MethodPut)
 	r.HandleFunc("/jobs/stop_job/{id}", api.stopJob).Methods(http.MethodPost, http.MethodPut)
 
+	r.HandleFunc("/jobs/", api.getJobs).Methods(http.MethodGet)
 	r.HandleFunc("/jobs/{id}", api.getJob).Methods(http.MethodGet)
 	r.HandleFunc("/jobs/tag_job/{id}", api.tagJob).Methods(http.MethodPost, http.MethodPatch)
 
-	r.HandleFunc("/machine_state/{cluster}/{host}", api.getMachineState).Methods(http.MethodGet)
+	if api.MachineStateDir != "" {
-	r.HandleFunc("/machine_state/{cluster}/{host}", api.putMachineState).Methods(http.MethodPut, http.MethodPost)
+		r.HandleFunc("/machine_state/{cluster}/{host}", api.getMachineState).Methods(http.MethodGet)
+		r.HandleFunc("/machine_state/{cluster}/{host}", api.putMachineState).Methods(http.MethodPut, http.MethodPost)
+	}
 }
 
 type StartJobApiRespone struct {
@@ -50,7 +55,7 @@ type StartJobApiRespone struct {
 type StopJobApiRequest struct {
 	// JobId, ClusterId and StartTime are optional.
 	// They are only used if no database id was provided.
-	JobId     *string `json:"jobId"`
+	JobId     *int64  `json:"jobId"`
 	Cluster   *string `json:"cluster"`
 	StartTime *int64  `json:"startTime"`
 
@@ -64,6 +69,44 @@ type TagJobApiRequest []*struct {
 	Type string `json:"type"`
 }
 
+// Return a list of jobs
+func (api *RestApi) getJobs(rw http.ResponseWriter, r *http.Request) {
+	filter := model.JobFilter{}
+	for key, vals := range r.URL.Query() {
+		switch key {
+		case "state":
+			for _, s := range vals {
+				state := schema.JobState(s)
+				if !state.Valid() {
+					http.Error(rw, "invalid query parameter value: state", http.StatusBadRequest)
+					return
+				}
+				filter.State = append(filter.State, state)
+			}
+		case "cluster":
+			filter.Cluster = &model.StringInput{Eq: &vals[0]}
+		default:
+			http.Error(rw, "invalid query parameter: "+key, http.StatusBadRequest)
+			return
+		}
+	}
+
+	results, err := api.Resolver.Query().Jobs(r.Context(), []*model.JobFilter{&filter}, nil, nil)
+	if err != nil {
+		http.Error(rw, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	bw := bufio.NewWriter(rw)
+	defer bw.Flush()
+
+	if err := json.NewEncoder(bw).Encode(results.Items); err != nil {
+		http.Error(rw, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
+
+// Return a single job
 func (api *RestApi) getJob(rw http.ResponseWriter, r *http.Request) {
 	id := mux.Vars(r)["id"]
 
@@ -84,6 +127,7 @@ func (api *RestApi) getJob(rw http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(rw).Encode(job)
 }
 
+// Add a tag to a job
 func (api *RestApi) tagJob(rw http.ResponseWriter, r *http.Request) {
 	id := mux.Vars(r)["id"]
 	job, err := api.Resolver.Query().Job(r.Context(), id)
@@ -130,6 +174,8 @@ func (api *RestApi) tagJob(rw http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(rw).Encode(job)
 }
 
+// A new job started. The body should be in the `meta.json` format, but some fields required
+// there are optional here (e.g. `jobState` defaults to "running").
 func (api *RestApi) startJob(rw http.ResponseWriter, r *http.Request) {
 	req := schema.JobMeta{BaseJob: schema.JobDefaults}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
@@ -142,6 +188,7 @@ func (api *RestApi) startJob(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// TODO: Do more such checks, be smarter with them.
 	if len(req.Resources) == 0 || len(req.User) == 0 || req.NumNodes == 0 {
 		http.Error(rw, "required fields are missing", http.StatusBadRequest)
 		return
@@ -193,6 +240,7 @@ func (api *RestApi) startJob(rw http.ResponseWriter, r *http.Request) {
 	})
 }
 
+// A job has stopped and should be archived.
 func (api *RestApi) stopJob(rw http.ResponseWriter, r *http.Request) {
 	req := StopJobApiRequest{}
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
@@ -207,10 +255,13 @@ func (api *RestApi) stopJob(rw http.ResponseWriter, r *http.Request) {
 	if ok {
 		sql, args, err = sq.Select(schema.JobColumns...).From("job").Where("job.id = ?", id).ToSql()
 	} else {
-		sql, args, err = sq.Select(schema.JobColumns...).From("job").
+		qb := sq.Select(schema.JobColumns...).From("job").
 			Where("job.job_id = ?", req.JobId).
-			Where("job.cluster = ?", req.Cluster).
+			Where("job.cluster = ?", req.Cluster)
-			Where("job.start_time = ?", req.StartTime).ToSql()
+		if req.StartTime != nil {
+			qb = qb.Where("job.start_time = ?", *req.StartTime)
+		}
+		sql, args, err = qb.ToSql()
 	}
 	if err != nil {
 		http.Error(rw, err.Error(), http.StatusBadRequest)
@@ -234,6 +285,10 @@ func (api *RestApi) stopJob(rw http.ResponseWriter, r *http.Request) {
 		req.State = schema.JobStateCompleted
 	}
 
+	// This closure does the real work. It needs to be its own
+	// function so that it can be done in the background.
+	// TODO: Throttle/Have a max. number or parallel archivngs
+	// or use a long-running goroutine receiving jobs by a channel.
 	doArchiving := func(job *schema.Job, ctx context.Context) error {
 		api.OngoingArchivings.Add(1)
 		defer api.OngoingArchivings.Done()