a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #225 from sgotti/runservice_fix_handling_of_wrong_executortask_status 

runservice: fix handling of wrong executortask status
This commit is contained in:
Simone Gotti 2020-03-02 10:26:32 +01:00 committed by GitHub
parent 4da7c23bb8 19611c18e7
commit eb180da914
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/services/runservice/scheduler.go
View File

@ -656,11 +656,13 @@ func (s *Runservice) updateRunTaskStatus(ctx context.Context, et *types.Executor
} }
case types.ExecutorTaskPhaseStopped: case types.ExecutorTaskPhaseStopped:
if rt.Status != types.RunTaskStatusStopped && if rt.Status != types.RunTaskStatusStopped &&
rt.Status != types.RunTaskStatusNotStarted &&
rt.Status != types.RunTaskStatusRunning { rt.Status != types.RunTaskStatusRunning {
wrongstatus = true wrongstatus = true
} }
case types.ExecutorTaskPhaseSuccess: case types.ExecutorTaskPhaseSuccess:
if rt.Status != types.RunTaskStatusSuccess && if rt.Status != types.RunTaskStatusSuccess &&
rt.Status != types.RunTaskStatusNotStarted &&
rt.Status != types.RunTaskStatusRunning { rt.Status != types.RunTaskStatusRunning {
wrongstatus = true wrongstatus = true
} }
@ -672,7 +674,7 @@ func (s *Runservice) updateRunTaskStatus(ctx context.Context, et *types.Executor
} }
} }
if wrongstatus { if wrongstatus {
log.Warnf("wrong executor task %q status: %q, rt status: %q", et.ID, et.Status.Phase, rt.Status) log.Warnf("ignoring wrong executor task %q status: %q, rt status: %q", et.ID, et.Status.Phase, rt.Status)
return nil return nil
} }