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

Manager: fix DB transaction isolation issue in task scheduler

Browse Source 
The created transaction wasn't actually used for the should-be-in-the-
transaction queries. That's now resolved.
This commit is contained in:
Sybren A. Stüvel 2022-03-03 13:46:27 +01:00
parent a563f36b98
commit 2b04623e00
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ func (js *StringStringMap) Scan(value interface{}) error {
// StoreJob stores an AuthoredJob and its tasks, and saves it to the database. // StoreJob stores an AuthoredJob and its tasks, and saves it to the database.
// The job will be in 'under construction' status. It is up to the caller to transition it to its desired initial status. // The job will be in 'under construction' status. It is up to the caller to transition it to its desired initial status.
func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.AuthoredJob) error { func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.AuthoredJob) error {
return db.gormDB.Transaction(func(tx *gorm.DB) error { return db.gormDB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
// TODO: separate conversion of struct types from storing things in the database. // TODO: separate conversion of struct types from storing things in the database.
dbJob := Job{ dbJob := Job{
UUID: authoredJob.JobID, UUID: authoredJob.JobID,
@ -126,7 +126,7 @@ func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.Au
Metadata: StringStringMap(authoredJob.Metadata), Metadata: StringStringMap(authoredJob.Metadata),
} }
if err := db.gormDB.WithContext(ctx).Create(&dbJob).Error; err != nil { if err := tx.Create(&dbJob).Error; err != nil {
return fmt.Errorf("error storing job: %v", err) return fmt.Errorf("error storing job: %v", err)
} }
@ -150,7 +150,7 @@ func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.Au
Commands: commands, Commands: commands,
// dependencies are stored below. // dependencies are stored below.
} }
if err := db.gormDB.WithContext(ctx).Create(&dbTask).Error; err != nil { if err := tx.Create(&dbTask).Error; err != nil {
return fmt.Errorf("error storing task: %v", err) return fmt.Errorf("error storing task: %v", err)
} }
@ -178,7 +178,7 @@ func (db *DB) StoreAuthoredJob(ctx context.Context, authoredJob job_compilers.Au
} }
dbTask.Dependencies = deps dbTask.Dependencies = deps
if err := db.gormDB.WithContext(ctx).Save(dbTask).Error; err != nil { if err := tx.Save(dbTask).Error; err != nil {
return fmt.Errorf("unable to store dependencies of task %q: %w", authoredTask.UUID, err) return fmt.Errorf("unable to store dependencies of task %q: %w", authoredTask.UUID, err)
} }
} }