531a0184f7
Replace old used-to-be-GORM datastructures (#104305) with sqlc-generated structs. This also makes it possible to use more specific structs that are more taylored to the specific queries, increasing efficiency. This commit deals with the remaining areas, like the job deleter, task timeout checker, and task state machine. And anything else to get things running again. Functional changes are kept to a minimum, as the API still serves the same data. Because this work covers so much of Flamenco's code, it's been split up into different commits. Each commit brings Flamenco to a state where it compiles and unit tests pass. Only the result of the final commit has actually been tested properly. Ref: #104343
85 lines
3.0 KiB
Go
85 lines
3.0 KiB
Go
package task_state_machine
|
|
|
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/golang/mock/gomock"
|
|
"github.com/stretchr/testify/require"
|
|
"projects.blender.org/studio/flamenco/internal/manager/persistence"
|
|
"projects.blender.org/studio/flamenco/pkg/api"
|
|
)
|
|
|
|
func TestRequeueActiveTasksOfWorker(t *testing.T) {
|
|
mockCtrl, ctx, sm, mocks := taskStateMachineTestFixtures(t)
|
|
defer mockCtrl.Finish()
|
|
|
|
worker := persistence.Worker{
|
|
UUID: "3ed470c8-d41e-4668-92d0-d799997433a4",
|
|
Name: "testert",
|
|
}
|
|
|
|
// Mock that the worker has two active tasks. It shouldn't happen, but even
|
|
// when it does, both should be requeued when the worker signs off.
|
|
task1, job := taskWithStatus(api.JobStatusActive, api.TaskStatusActive)
|
|
task2 := taskOfSameJob(task1, api.TaskStatusActive)
|
|
workerTasks := []persistence.TaskJob{
|
|
{Task: *task1, JobUUID: job.UUID},
|
|
{Task: *task2, JobUUID: job.UUID},
|
|
}
|
|
|
|
task1PrevStatus := task1.Status
|
|
task2PrevStatus := task2.Status
|
|
|
|
mocks.persist.EXPECT().FetchTasksOfWorkerInStatus(ctx, &worker, api.TaskStatusActive).Return(workerTasks, nil)
|
|
|
|
// Expect this re-queueing to end up in the task's log and activity.
|
|
logMsg1 := "task changed status active -> queued"
|
|
logMsg2 := "Task was requeued by Manager because worker had to test"
|
|
task1WithActivity := *task1
|
|
task1WithActivity.Activity = logMsg2
|
|
task2WithActivity := *task2
|
|
task2WithActivity.Activity = logMsg2
|
|
task1WithActivityAndStatus := task1WithActivity
|
|
task1WithActivityAndStatus.Status = api.TaskStatusQueued
|
|
task2WithActivityAndStatus := task2WithActivity
|
|
task2WithActivityAndStatus.Status = api.TaskStatusQueued
|
|
mocks.persist.EXPECT().SaveTaskActivity(ctx, &task1WithActivity)
|
|
mocks.persist.EXPECT().SaveTaskActivity(ctx, &task2WithActivity)
|
|
mocks.persist.EXPECT().SaveTaskStatus(ctx, &task1WithActivityAndStatus)
|
|
mocks.persist.EXPECT().SaveTaskStatus(ctx, &task2WithActivityAndStatus)
|
|
|
|
mocks.logStorage.EXPECT().WriteTimestamped(gomock.Any(), job.UUID, task1.UUID, logMsg1)
|
|
mocks.logStorage.EXPECT().WriteTimestamped(gomock.Any(), job.UUID, task2.UUID, logMsg1)
|
|
|
|
mocks.logStorage.EXPECT().WriteTimestamped(gomock.Any(), job.UUID, task1.UUID, logMsg2)
|
|
mocks.logStorage.EXPECT().WriteTimestamped(gomock.Any(), job.UUID, task2.UUID, logMsg2)
|
|
|
|
mocks.broadcaster.EXPECT().BroadcastTaskUpdate(api.EventTaskUpdate{
|
|
Activity: logMsg2,
|
|
Id: task1.UUID,
|
|
JobId: job.UUID,
|
|
Name: task1.Name,
|
|
PreviousStatus: &task1PrevStatus,
|
|
Status: api.TaskStatusQueued,
|
|
Updated: task1.UpdatedAt.Time,
|
|
})
|
|
|
|
mocks.broadcaster.EXPECT().BroadcastTaskUpdate(api.EventTaskUpdate{
|
|
Activity: logMsg2,
|
|
Id: task2.UUID,
|
|
JobId: job.UUID,
|
|
Name: task2.Name,
|
|
PreviousStatus: &task2PrevStatus,
|
|
Status: api.TaskStatusQueued,
|
|
Updated: task2.UpdatedAt.Time,
|
|
})
|
|
|
|
mocks.expectFetchJobOfTask(task1, job)
|
|
mocks.expectFetchJobOfTask(task2, job)
|
|
|
|
err := sm.RequeueActiveTasksOfWorker(ctx, &worker, "worker had to test")
|
|
require.NoError(t, err)
|
|
}
|