blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: use api.TaskStatus in persistence layer as well

Browse Source
This commit is contained in:
Sybren A. Stüvel 2022-02-24 11:53:05 +01:00
parent 4cd10e57b2
commit 7e776167bb
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/manager/api_impl/jobs.go
View File

@ -187,10 +187,10 @@ func (f *Flamenco) doTaskUpdate(
if update.TaskStatus != nil { if update.TaskStatus != nil {
// TODO: check that this status transition is valid. // TODO: check that this status transition is valid.
// TODO: process this status transition. // TODO: process this status transition.
newStatus := string(*update.TaskStatus) newStatus := *update.TaskStatus
logger.Info(). logger.Info().
Str("oldStatus", dbTask.Status). Str("oldStatus", string(dbTask.Status)).
Str("newStatus", newStatus). Str("newStatus", string(newStatus)).
Msg("task changing status") Msg("task changing status")
dbTask.Status = newStatus dbTask.Status = newStatus
} }

14
internal/manager/persistence/jobs.go
View File

@ -52,12 +52,12 @@ type Task struct {
gorm.Model gorm.Model
UUID string `gorm:"type:char(36);not null;unique;index"` UUID string `gorm:"type:char(36);not null;unique;index"`
Name string `gorm:"type:varchar(64);not null"` Name string `gorm:"type:varchar(64);not null"`
Type string `gorm:"type:varchar(32);not null"` Type string `gorm:"type:varchar(32);not null"`
JobID uint `gorm:"not null"` JobID uint `gorm:"not null"`
Job *Job `gorm:"foreignkey:JobID;references:ID;constraint:OnDelete:CASCADE;not null"` Job *Job `gorm:"foreignkey:JobID;references:ID;constraint:OnDelete:CASCADE;not null"`
Priority int `gorm:"type:smallint;not null"` Priority int `gorm:"type:smallint;not null"`
Status string `gorm:"type:varchar(16);not null"` Status api.TaskStatus `gorm:"type:varchar(16);not null"`
// Which worker is/was working on this. // Which worker is/was working on this.
WorkerID *uint WorkerID *uint
@ -145,7 +145,7 @@ func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.Au
UUID: authoredTask.UUID, UUID: authoredTask.UUID,
Job: &dbJob, Job: &dbJob,
Priority: authoredTask.Priority, Priority: authoredTask.Priority,
Status: string(api.TaskStatusQueued), Status: api.TaskStatusQueued,
Commands: commands, Commands: commands,
// dependencies are stored below. // dependencies are stored below.
} }

6
internal/manager/persistence/jobs_test.go
View File

@ -122,7 +122,7 @@ func TestStoreAuthoredJob(t *testing.T) {
} }
// TODO: test task contents. // TODO: test task contents.
assert.Equal(t, string(api.TaskStatusQueued), tasks[0].Status) assert.Equal(t, api.TaskStatusQueued, tasks[0].Status)
assert.Equal(t, string(api.TaskStatusQueued), tasks[1].Status) assert.Equal(t, api.TaskStatusQueued, tasks[1].Status)
assert.Equal(t, string(api.TaskStatusQueued), tasks[2].Status) assert.Equal(t, api.TaskStatusQueued, tasks[2].Status)
} }