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

runservice: correctly handle skipped tasks in fetcher 

skip fetching of tasks with status skipped, not only tasks marked as skip.
This avoid many wrong an noisy logs of type "executor task with id taskid
doesn't exist. This shouldn't happen. Skipping fetching"
This commit is contained in:
Simone Gotti 2020-03-02 10:36:40 +01:00
parent eb180da914
commit 0e2b01a586
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -890,7 +890,7 @@ func (s *Runservice) fetchLog(ctx context.Context, rt *types.RunTask, setup bool
return err return err
} }
if et == nil { if et == nil {
if !rt.Skip { if rt.Status != types.RunTaskStatusSkipped {
log.Errorf("executor task with id %q doesn't exist. This shouldn't happen. Skipping fetching", rt.ID) log.Errorf("executor task with id %q doesn't exist. This shouldn't happen. Skipping fetching", rt.ID)
} }
return nil return nil
@ -1053,7 +1053,9 @@ func (s *Runservice) fetchArchive(ctx context.Context, rt *types.RunTask, stepnu
return err return err
} }
if et == nil { if et == nil {
log.Errorf("executor task with id %q doesn't exist. This shouldn't happen. Skipping fetching", rt.ID) if rt.Status != types.RunTaskStatusSkipped {
log.Errorf("executor task with id %q doesn't exist. This shouldn't happen. Skipping fetching", rt.ID)
}
return nil return nil
} }
executor, err := store.GetExecutor(ctx, s.e, et.Spec.ExecutorID) executor, err := store.GetExecutor(ctx, s.e, et.Spec.ExecutorID)