studio/flamenco
studio/flamenco
12
30
Fork 38
Code Issues 63 Pull Requests 5 Releases Wiki Activity

Fix #99549: Remember Previous Status #104217

Merged
Sybren A. Stüvel merged 16 commits from Evelinealy/flamenco:web-api-upgrade into main 2023-06-02 22:50:10 +02:00
Conversation 7 Commits 16 Files Changed 3 +16 -8
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 15625ea001 - Show all commits

5
internal/manager/api_impl/workers.go
View File

@ -163,6 +163,11 @@ func (f *Flamenco) SignOff(e echo.Context) error {
w.StatusChangeClear() w.StatusChangeClear()
} }
// Remember the previous status if an initial status exists
if w.StatusRequested == "" {
w.StatusChangeRequest(prevStatus, false)
}
// Pass a generic background context, as these changes should be stored even // Pass a generic background context, as these changes should be stored even
// when the HTTP connection is aborted. // when the HTTP connection is aborted.
bgCtx, bgCtxCancel := bgContext() bgCtx, bgCtxCancel := bgContext()

19
internal/manager/api_impl/workers_test.go
View File

@ -297,25 +297,28 @@ func TestWorkerRememberPreviousStatus(t *testing.T) {
worker := testWorker() worker := testWorker()
worker.Status = api.WorkerStatusTesting worker.Status = api.WorkerStatusTesting
initialStatusRequested := worker.StatusRequested
initialLazyStatusRequest := worker.LazyStatusRequest
worker.StatusChangeRequest(api.WorkerStatusOffline, true) worker.StatusChangeRequest(api.WorkerStatusOffline, true)
mf.broadcaster.EXPECT().BroadcastWorkerUpdate(api.SocketIOWorkerUpdate{ mf.broadcaster.EXPECT().BroadcastWorkerUpdate(api.SocketIOWorkerUpdate{
Id: worker.UUID, Id: worker.UUID,
Name: worker.Name, Name: worker.Name,
PreviousStatus: ptr(api.WorkerStatusTesting), PreviousStatus: ptr(api.WorkerStatusAwake),
Status: api.WorkerStatusOffline, Status: api.WorkerStatusOffline,
StatusChange: &api.WorkerStatusChangeRequest{
IsLazy: false,
Status: api.WorkerStatusAwake,
},
Updated: worker.UpdatedAt, Updated: worker.UpdatedAt,
Version: worker.Software, Version: worker.Software,
}) })
savedWorker := worker savedWorker := worker
savedWorker.Status = api.WorkerStatusOffline savedWorker.Status = api.WorkerStatusOffline
savedWorker.StatusChangeClear() savedWorker.StatusRequested = api.WorkerStatusAwake
savedWorker.LazyStatusRequest = false
mf.persistence.EXPECT().SaveWorkerStatus(gomock.Any(), &savedWorker).Return(nil) mf.persistence.EXPECT().SaveWorkerStatus(gomock.Any(), &savedWorker).Return(nil)
mf.stateMachine.EXPECT().RequeueActiveTasksOfWorker(gomock.Any(), &worker, "worker signed off").Return(nil) mf.stateMachine.EXPECT().RequeueActiveTasksOfWorker(gomock.Any(), gomock.Eq(&worker), "worker signed off").Return(nil)
mf.persistence.EXPECT().WorkerSeen(gomock.Any(), &worker) mf.persistence.EXPECT().WorkerSeen(gomock.Any(), gomock.Eq(&worker))
worker.Status = api.WorkerStatusAwake worker.Status = api.WorkerStatusAwake
@ -325,8 +328,8 @@ func TestWorkerRememberPreviousStatus(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assertResponseNoContent(t, echo) assertResponseNoContent(t, echo)
assert.Equal(t, initialStatusRequested, worker.StatusRequested) assert.Equal(t, api.WorkerStatusAwake, worker.StatusRequested)
assert.Equal(t, initialLazyStatusRequest, worker.LazyStatusRequest) assert.Equal(t, false, worker.LazyStatusRequest)
} }
func TestWorkerState(t *testing.T) { func TestWorkerState(t *testing.T) {