ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-12-26 13:29:05 +01:00
Code Issues Packages Releases Activity

Cleanup stop job code. Still broken

Browse Source
This commit is contained in:
Jan Eitzinger 2022-02-15 12:47:23 +01:00
parent ec677d26d2
commit d8782f4d3b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/rest.go
View File

@ -310,7 +310,7 @@ func (api *RestApi) stopJob(rw http.ResponseWriter, r *http.Request) {
// function so that it can be done in the background. // function so that it can be done in the background.
// TODO: Throttle/Have a max. number or parallel archivngs // TODO: Throttle/Have a max. number or parallel archivngs
// or use a long-running goroutine receiving jobs by a channel. // or use a long-running goroutine receiving jobs by a channel.
doArchiving := func(job *schema.Job, ctx context.Context) error { doArchiving := func(job *schema.Job, ctx context.Context) {
api.OngoingArchivings.Add(1) api.OngoingArchivings.Add(1)
defer api.OngoingArchivings.Done() defer api.OngoingArchivings.Done()
@ -318,11 +318,9 @@ func (api *RestApi) stopJob(rw http.ResponseWriter, r *http.Request) {
jobMeta, err := metricdata.ArchiveJob(job, ctx) jobMeta, err := metricdata.ArchiveJob(job, ctx)
if err != nil { if err != nil {
log.Errorf("archiving job (dbid: %d) failed: %s", job.ID, err.Error()) log.Errorf("archiving job (dbid: %d) failed: %s", job.ID, err.Error())
return err
} }
api.JobRepository.Archive(job.ID, 0, jobMeta.Statistics) api.JobRepository.Archive(job.ID, 0, jobMeta.Statistics)
log.Printf("job stopped and archived (dbid: %d)", job.ID) log.Printf("job stopped and archived (dbid: %d)", job.ID)
return nil
} }
log.Printf("archiving job... (dbid: %d): cluster=%s, jobId=%d, user=%s, startTime=%s", job.ID, job.Cluster, job.JobID, job.User, job.StartTime) log.Printf("archiving job... (dbid: %d): cluster=%s, jobId=%d, user=%s, startTime=%s", job.ID, job.Cluster, job.JobID, job.User, job.StartTime)