particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osbuild-service-maintenance: Reword log messages and query name

Browse source 
The query is deleting multiple jobs, and it's deleting the entire job,
not just the results.
This commit is contained in:
Sanne Raymaekers 2022-07-30 13:20:48 +02:00
parent 322ae02f73
commit 2eaad3701d
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
cmd/osbuild-service-maintenance/db.go
View file

@ -10,8 +10,7 @@ import (
) )
const ( const (
// Maintenance queries sqlDeleteJobs = `
sqlDeleteJob = `
DELETE FROM jobs DELETE FROM jobs
WHERE id IN ( WHERE id IN (
SELECT id FROM jobs SELECT id FROM jobs
@ -48,10 +47,10 @@ func (d *db) Close() {
d.Conn.Close(context.Background()) d.Conn.Close(context.Background())
} }
func (d *db) DeleteJob() (int64, error) { func (d *db) DeleteJobs() (int64, error) {
tag, err := d.Conn.Exec(context.Background(), sqlDeleteJob) tag, err := d.Conn.Exec(context.Background(), sqlDeleteJobs)
if err != nil { if err != nil {
return tag.RowsAffected(), fmt.Errorf("Error deleting results from jobs: %v", err) return tag.RowsAffected(), fmt.Errorf("Error deleting jobs: %v", err)
} }
return tag.RowsAffected(), nil return tag.RowsAffected(), nil
} }
@ -124,10 +123,9 @@ func DBCleanup(dbURL string, dryRun bool, cutoff time.Time) error {
var rows int64 var rows int64
for { for {
rows, err = db.DeleteJob() rows, err = db.DeleteJobs()
if err != nil { if err != nil {
logrus.Errorf("Error deleting results for jobs: %v, %d rows affected", rows, err) logrus.Errorf("Error deleting jobs: %v, %d rows affected", rows, err)
return err return err
} }

4
cmd/osbuild-service-maintenance/db_test.go
View file

@ -67,13 +67,13 @@ func testDeleteJob(t *testing.T, d db, q *dbjobqueue.DBJobQueue) {
require.NoError(t, json.Unmarshal(r, &r1)) require.NoError(t, json.Unmarshal(r, &r1))
require.Equal(t, result, r1) require.Equal(t, result, r1)
rows, err := d.DeleteJob() rows, err := d.DeleteJobs()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, int64(0), rows) require.Equal(t, int64(0), rows)
setExpired(t, d, id) setExpired(t, d, id)
rows, err = d.DeleteJob() rows, err = d.DeleteJobs()
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, int64(1), rows) require.Equal(t, int64(1), rows)