Merge pull request agola-io#226 from sgotti/runservice_fetcher_correc…

…tly_handle_skipped_tasks runservice: correctly handle skipped tasks in fetcher
tulliobotti64 · Mar 2, 2020 · 1208579 · 1208579
2 parents 70f038d + aaf1787
commit 1208579
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/internal/services/runservice/scheduler.go b/internal/services/runservice/scheduler.go
@@ -890,7 +890,7 @@ func (s *Runservice) fetchLog(ctx context.Context, rt *types.RunTask, setup bool
 		return err
 	}
 	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)
 		}
 		return nil
@@ -1053,7 +1053,9 @@ func (s *Runservice) fetchArchive(ctx context.Context, rt *types.RunTask, stepnu
 		return err
 	}
 	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
 	}
 	executor, err := store.GetExecutor(ctx, s.e, et.Spec.ExecutorID)