Merge branch 'master' into 97_107_mark_and_show_shared

- Solves query.go conflict by splitting QueryJobLinks function aswell
This commit is contained in:
Christoph Kluge
2023-06-01 17:48:43 +02:00
16 changed files with 290 additions and 60 deletions

View File

@@ -74,7 +74,7 @@ func scanJob(row interface{ Scan(...interface{}) error }) (*schema.Job, error) {
&job.ID, &job.JobID, &job.User, &job.Project, &job.Cluster, &job.SubCluster, &job.StartTimeUnix, &job.Partition, &job.ArrayJobId,
&job.NumNodes, &job.NumHWThreads, &job.NumAcc, &job.Exclusive, &job.MonitoringStatus, &job.SMT, &job.State,
&job.Duration, &job.Walltime, &job.RawResources /*&job.RawMetaData*/); err != nil {
log.Warn("Error while scanning rows (Job)")
log.Warnf("Error while scanning rows (Job): %v", err)
return nil, err
}