diff --git a/internal/manager/api_impl/interfaces.go b/internal/manager/api_impl/interfaces.go index 26d59c35..2b13d82d 100644 --- a/internal/manager/api_impl/interfaces.go +++ b/internal/manager/api_impl/interfaces.go @@ -74,7 +74,7 @@ type TaskStateMachine interface { // JobStatusChange gives a Job a new status, and handles the resulting status changes on its tasks. JobStatusChange(ctx context.Context, job *persistence.Job, newJobStatus api.JobStatus, reason string) error - RequeueTasksOfWorker(ctx context.Context, worker *persistence.Worker, reason string) error + RequeueActiveTasksOfWorker(ctx context.Context, worker *persistence.Worker, reason string) error } // TaskStateMachine should be a subset of task_state_machine.StateMachine. diff --git a/internal/manager/api_impl/mocks/api_impl_mock.gen.go b/internal/manager/api_impl/mocks/api_impl_mock.gen.go index a6355db4..cabc3193 100644 --- a/internal/manager/api_impl/mocks/api_impl_mock.gen.go +++ b/internal/manager/api_impl/mocks/api_impl_mock.gen.go @@ -665,18 +665,18 @@ func (mr *MockTaskStateMachineMockRecorder) JobStatusChange(arg0, arg1, arg2, ar return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "JobStatusChange", reflect.TypeOf((*MockTaskStateMachine)(nil).JobStatusChange), arg0, arg1, arg2, arg3) } -// RequeueTasksOfWorker mocks base method. -func (m *MockTaskStateMachine) RequeueTasksOfWorker(arg0 context.Context, arg1 *persistence.Worker, arg2 string) error { +// RequeueActiveTasksOfWorker mocks base method. +func (m *MockTaskStateMachine) RequeueActiveTasksOfWorker(arg0 context.Context, arg1 *persistence.Worker, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RequeueTasksOfWorker", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "RequeueActiveTasksOfWorker", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } -// RequeueTasksOfWorker indicates an expected call of RequeueTasksOfWorker. -func (mr *MockTaskStateMachineMockRecorder) RequeueTasksOfWorker(arg0, arg1, arg2 interface{}) *gomock.Call { +// RequeueActiveTasksOfWorker indicates an expected call of RequeueActiveTasksOfWorker. +func (mr *MockTaskStateMachineMockRecorder) RequeueActiveTasksOfWorker(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequeueTasksOfWorker", reflect.TypeOf((*MockTaskStateMachine)(nil).RequeueTasksOfWorker), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequeueActiveTasksOfWorker", reflect.TypeOf((*MockTaskStateMachine)(nil).RequeueActiveTasksOfWorker), arg0, arg1, arg2) } // TaskStatusChange mocks base method. diff --git a/internal/manager/api_impl/workers.go b/internal/manager/api_impl/workers.go index 3b8cb20c..329b7ade 100644 --- a/internal/manager/api_impl/workers.go +++ b/internal/manager/api_impl/workers.go @@ -177,7 +177,7 @@ func (f *Flamenco) SignOff(e echo.Context) error { _ = f.workerSeen(ctx, logger, w) // Re-queue all tasks (should be only one) this worker is now working on. - err = f.stateMachine.RequeueTasksOfWorker(ctx, w, "worker signed off") + err = f.stateMachine.RequeueActiveTasksOfWorker(ctx, w, "worker signed off") if err != nil { return sendAPIError(e, http.StatusInternalServerError, "error re-queueing your tasks") } diff --git a/internal/manager/api_impl/workers_test.go b/internal/manager/api_impl/workers_test.go index 7cc29b25..04f0fdf9 100644 --- a/internal/manager/api_impl/workers_test.go +++ b/internal/manager/api_impl/workers_test.go @@ -199,7 +199,7 @@ func TestWorkerSignoffTaskRequeue(t *testing.T) { expectCtx := gomock.Not(gomock.Eq(echo.Request().Context())) // Expect worker's tasks to be re-queued. - mf.stateMachine.EXPECT().RequeueTasksOfWorker(expectCtx, &worker, "worker signed off").Return(nil) + mf.stateMachine.EXPECT().RequeueActiveTasksOfWorker(expectCtx, &worker, "worker signed off").Return(nil) mf.persistence.EXPECT().WorkerSeen(expectCtx, &worker) // Expect worker to be saved as 'offline'. @@ -251,7 +251,7 @@ func TestWorkerSignoffStatusChangeRequest(t *testing.T) { savedWorker.StatusChangeClear() mf.persistence.EXPECT().SaveWorkerStatus(gomock.Any(), &savedWorker).Return(nil) - mf.stateMachine.EXPECT().RequeueTasksOfWorker(gomock.Any(), &worker, "worker signed off").Return(nil) + mf.stateMachine.EXPECT().RequeueActiveTasksOfWorker(gomock.Any(), &worker, "worker signed off").Return(nil) mf.persistence.EXPECT().WorkerSeen(gomock.Any(), &worker) // Perform the request diff --git a/internal/manager/task_state_machine/worker_requeue.go b/internal/manager/task_state_machine/worker_requeue.go index d0aff5b8..552f2ddf 100644 --- a/internal/manager/task_state_machine/worker_requeue.go +++ b/internal/manager/task_state_machine/worker_requeue.go @@ -11,10 +11,10 @@ import ( "github.com/rs/zerolog/log" ) -// RequeueTasksOfWorker re-queues all active tasks (should be max one) of this worker. +// RequeueActiveTasksOfWorker re-queues all active tasks (should be max one) of this worker. // // `reason`: a string that can be appended to text like "Task requeued because " -func (sm *StateMachine) RequeueTasksOfWorker( +func (sm *StateMachine) RequeueActiveTasksOfWorker( ctx context.Context, worker *persistence.Worker, reason string, diff --git a/internal/manager/task_state_machine/worker_requeue_test.go b/internal/manager/task_state_machine/worker_requeue_test.go index abb19d5a..ad0070e8 100644 --- a/internal/manager/task_state_machine/worker_requeue_test.go +++ b/internal/manager/task_state_machine/worker_requeue_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" ) -func TestRequeueTasksOfWorker(t *testing.T) { +func TestRequeueActiveTasksOfWorker(t *testing.T) { mockCtrl, ctx, sm, mocks := taskStateMachineTestFixtures(t) defer mockCtrl.Finish() @@ -59,6 +59,6 @@ func TestRequeueTasksOfWorker(t *testing.T) { Updated: task2.UpdatedAt, }) - err := sm.RequeueTasksOfWorker(ctx, &worker, "worker had to test") + err := sm.RequeueActiveTasksOfWorker(ctx, &worker, "worker had to test") assert.NoError(t, err) } diff --git a/internal/manager/timeout_checker/interfaces.go b/internal/manager/timeout_checker/interfaces.go index c8aee8ef..8e5b7207 100644 --- a/internal/manager/timeout_checker/interfaces.go +++ b/internal/manager/timeout_checker/interfaces.go @@ -27,7 +27,7 @@ var _ PersistenceService = (*persistence.DB)(nil) type TaskStateMachine interface { // TaskStatusChange gives a Task a new status, and handles the resulting status changes on the job. TaskStatusChange(ctx context.Context, task *persistence.Task, newStatus api.TaskStatus) error - RequeueTasksOfWorker(ctx context.Context, worker *persistence.Worker, reason string) error + RequeueActiveTasksOfWorker(ctx context.Context, worker *persistence.Worker, reason string) error } var _ TaskStateMachine = (*task_state_machine.StateMachine)(nil) diff --git a/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go b/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go index 9a7367fd..c9ffafd8 100644 --- a/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go +++ b/internal/manager/timeout_checker/mocks/interfaces_mock.gen.go @@ -105,18 +105,18 @@ func (m *MockTaskStateMachine) EXPECT() *MockTaskStateMachineMockRecorder { return m.recorder } -// RequeueTasksOfWorker mocks base method. -func (m *MockTaskStateMachine) RequeueTasksOfWorker(arg0 context.Context, arg1 *persistence.Worker, arg2 string) error { +// RequeueActiveTasksOfWorker mocks base method. +func (m *MockTaskStateMachine) RequeueActiveTasksOfWorker(arg0 context.Context, arg1 *persistence.Worker, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RequeueTasksOfWorker", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "RequeueActiveTasksOfWorker", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } -// RequeueTasksOfWorker indicates an expected call of RequeueTasksOfWorker. -func (mr *MockTaskStateMachineMockRecorder) RequeueTasksOfWorker(arg0, arg1, arg2 interface{}) *gomock.Call { +// RequeueActiveTasksOfWorker indicates an expected call of RequeueActiveTasksOfWorker. +func (mr *MockTaskStateMachineMockRecorder) RequeueActiveTasksOfWorker(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequeueTasksOfWorker", reflect.TypeOf((*MockTaskStateMachine)(nil).RequeueTasksOfWorker), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RequeueActiveTasksOfWorker", reflect.TypeOf((*MockTaskStateMachine)(nil).RequeueActiveTasksOfWorker), arg0, arg1, arg2) } // TaskStatusChange mocks base method. diff --git a/internal/manager/timeout_checker/workers.go b/internal/manager/timeout_checker/workers.go index a00dc8fc..56dcee01 100644 --- a/internal/manager/timeout_checker/workers.go +++ b/internal/manager/timeout_checker/workers.go @@ -54,7 +54,7 @@ func (ttc *TimeoutChecker) timeoutWorker(ctx context.Context, worker *persistenc logger.Error().Err(err).Msg("TimeoutChecker: error saving timed-out worker to database") } - err = ttc.taskStateMachine.RequeueTasksOfWorker(ctx, worker, "worker timed out") + err = ttc.taskStateMachine.RequeueActiveTasksOfWorker(ctx, worker, "worker timed out") if err != nil { logger.Error().Err(err).Msg("TimeoutChecker: error re-queueing tasks of timed-out worker") } diff --git a/internal/manager/timeout_checker/workers_test.go b/internal/manager/timeout_checker/workers_test.go index 1cb9f2f6..363ff5d2 100644 --- a/internal/manager/timeout_checker/workers_test.go +++ b/internal/manager/timeout_checker/workers_test.go @@ -43,7 +43,7 @@ func TestWorkerTimeout(t *testing.T) { Return([]*persistence.Worker{&worker}, nil) // Expect all tasks assigned to the worker to get requeued. - mocks.taskStateMachine.EXPECT().RequeueTasksOfWorker(mocks.ctx, &worker, "worker timed out") + mocks.taskStateMachine.EXPECT().RequeueActiveTasksOfWorker(mocks.ctx, &worker, "worker timed out") persistedWorker := worker persistedWorker.Status = api.WorkerStatusError