ClusterCockpit/cc-backend
1
0
Fork 0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2024-09-20 11:27:26 +02:00
Code Issues Packages Releases Activity

Refactor

Browse Source 
Reformat.
Convert to query builder.
Add descriptive error log messages.
This commit is contained in:
Jan Eitzinger 2024-03-06 14:50:08 +01:00
parent dd887cbb1f
commit aa6336ea1e
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
internal/repository/job.go
View File

@ -223,8 +223,8 @@ func (r *JobRepository) UpdateMetadata(job *schema.Job, key, val string) (err er
func (r *JobRepository) Find( func (r *JobRepository) Find(
jobId *int64, jobId *int64,
cluster *string, cluster *string,
startTime *int64) (*schema.Job, error) { startTime *int64,
) (*schema.Job, error) {
start := time.Now() start := time.Now()
q := sq.Select(jobColumns...).From("job"). q := sq.Select(jobColumns...).From("job").
Where("job.job_id = ?", *jobId) Where("job.job_id = ?", *jobId)
@ -248,8 +248,8 @@ func (r *JobRepository) Find(
func (r *JobRepository) FindAll( func (r *JobRepository) FindAll(
jobId *int64, jobId *int64,
cluster *string, cluster *string,
startTime *int64) ([]*schema.Job, error) { startTime *int64,
) ([]*schema.Job, error) {
start := time.Now() start := time.Now()
q := sq.Select(jobColumns...).From("job"). q := sq.Select(jobColumns...).From("job").
Where("job.job_id = ?", *jobId) Where("job.job_id = ?", *jobId)
@ -292,7 +292,8 @@ func (r *JobRepository) FindById(jobId int64) (*schema.Job, error) {
func (r *JobRepository) FindConcurrentJobs( func (r *JobRepository) FindConcurrentJobs(
ctx context.Context, ctx context.Context,
job *schema.Job) (*model.JobLinkResultList, error) { job *schema.Job,
) (*model.JobLinkResultList, error) {
if job == nil { if job == nil {
return nil, nil return nil, nil
} }
@ -420,8 +421,8 @@ func (r *JobRepository) Stop(
jobId int64, jobId int64,
duration int32, duration int32,
state schema.JobState, state schema.JobState,
monitoringStatus int32) (err error) { monitoringStatus int32,
) (err error) {
stmt := sq.Update("job"). stmt := sq.Update("job").
Set("job_state", state). Set("job_state", state).
Set("duration", duration). Set("duration", duration).
@ -434,11 +435,14 @@ func (r *JobRepository) Stop(
func (r *JobRepository) DeleteJobsBefore(startTime int64) (int, error) { func (r *JobRepository) DeleteJobsBefore(startTime int64) (int, error) {
var cnt int var cnt int
qs := fmt.Sprintf("SELECT count(*) FROM job WHERE job.start_time < %d", startTime) q := sq.Select("count(*)").From("job").Where("job.start_time < ?", startTime)
err := r.DB.Get(&cnt, qs) //ignore error as it will also occur in delete statement q.RunWith(r.DB).QueryRow().Scan(cnt)
_, err = r.DB.Exec(`DELETE FROM job WHERE job.start_time < ?`, startTime) qd := sq.Delete("job").Where("job.start_time < ?", startTime)
_, err := qd.RunWith(r.DB).Exec()
if err != nil { if err != nil {
log.Errorf(" DeleteJobsBefore(%d): error %#v", startTime, err) s, _, _ := qd.ToSql()
log.Errorf(" DeleteJobsBefore(%d) with %s: error %#v", startTime, s, err)
} else { } else {
log.Debugf("DeleteJobsBefore(%d): Deleted %d jobs", startTime, cnt) log.Debugf("DeleteJobsBefore(%d): Deleted %d jobs", startTime, cnt)
} }
@ -446,9 +450,12 @@ func (r *JobRepository) DeleteJobsBefore(startTime int64) (int, error) {
} }
func (r *JobRepository) DeleteJobById(id int64) error { func (r *JobRepository) DeleteJobById(id int64) error {
_, err := r.DB.Exec(`DELETE FROM job WHERE job.id = ?`, id) qd := sq.Delete("job").Where("job.id = ?", id)
_, err := qd.RunWith(r.DB).Exec()
if err != nil { if err != nil {
log.Errorf("DeleteJobById(%d): error %#v", id, err) s, _, _ := qd.ToSql()
log.Errorf("DeleteJobById(%d) with %s : error %#v", id, s, err)
} else { } else {
log.Debugf("DeleteJobById(%d): Success", id) log.Debugf("DeleteJobById(%d): Success", id)
} }
@ -468,8 +475,8 @@ func (r *JobRepository) UpdateMonitoringStatus(job int64, monitoringStatus int32
func (r *JobRepository) MarkArchived( func (r *JobRepository) MarkArchived(
jobId int64, jobId int64,
monitoringStatus int32, monitoringStatus int32,
metricStats map[string]schema.JobStatistics) error { metricStats map[string]schema.JobStatistics,
) error {
stmt := sq.Update("job"). stmt := sq.Update("job").
Set("monitoring_status", monitoringStatus). Set("monitoring_status", monitoringStatus).
Where("job.id = ?", jobId) Where("job.id = ?", jobId)
@ -578,8 +585,10 @@ func (r *JobRepository) FindUserOrProjectOrJobname(user *schema.User, searchterm
} }
} }
var ErrNotFound = errors.New("no such jobname, project or user") var (
var ErrForbidden = errors.New("not authorized") ErrNotFound = errors.New("no such jobname, project or user")
ErrForbidden = errors.New("not authorized")
)
func (r *JobRepository) FindColumnValue(user *schema.User, searchterm string, table string, selectColumn string, whereColumn string, isLike bool) (result string, err error) { func (r *JobRepository) FindColumnValue(user *schema.User, searchterm string, table string, selectColumn string, whereColumn string, isLike bool) (result string, err error) {
compareStr := " = ?" compareStr := " = ?"
@ -663,7 +672,6 @@ func (r *JobRepository) Partitions(cluster string) ([]string, error) {
// AllocatedNodes returns a map of all subclusters to a map of hostnames to the amount of jobs running on that host. // AllocatedNodes returns a map of all subclusters to a map of hostnames to the amount of jobs running on that host.
// Hosts with zero jobs running on them will not show up! // Hosts with zero jobs running on them will not show up!
func (r *JobRepository) AllocatedNodes(cluster string) (map[string]map[string]int, error) { func (r *JobRepository) AllocatedNodes(cluster string) (map[string]map[string]int, error) {
start := time.Now() start := time.Now()
subclusters := make(map[string]map[string]int) subclusters := make(map[string]map[string]int)
rows, err := sq.Select("resources", "subcluster").From("job"). rows, err := sq.Select("resources", "subcluster").From("job").
@ -706,7 +714,6 @@ func (r *JobRepository) AllocatedNodes(cluster string) (map[string]map[string]in
} }
func (r *JobRepository) StopJobsExceedingWalltimeBy(seconds int) error { func (r *JobRepository) StopJobsExceedingWalltimeBy(seconds int) error {
start := time.Now() start := time.Now()
res, err := sq.Update("job"). res, err := sq.Update("job").
Set("monitoring_status", schema.MonitoringStatusArchivingFailed). Set("monitoring_status", schema.MonitoringStatusArchivingFailed).
@ -735,7 +742,6 @@ func (r *JobRepository) StopJobsExceedingWalltimeBy(seconds int) error {
} }
func (r *JobRepository) FindJobsBetween(startTimeBegin int64, startTimeEnd int64) ([]*schema.Job, error) { func (r *JobRepository) FindJobsBetween(startTimeBegin int64, startTimeEnd int64) ([]*schema.Job, error) {
var query sq.SelectBuilder var query sq.SelectBuilder
if startTimeBegin == startTimeEnd || startTimeBegin > startTimeEnd { if startTimeBegin == startTimeEnd || startTimeBegin > startTimeEnd {