jobloop: fix counting of failed tasks in single-threaded ProducerCons…

…umerJob
sapcc · Sep 12, 2023 · 3a5bef4 · 3a5bef4
1 parent 81ca24d
commit 3a5bef4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/jobloop/producer_consumer.go b/jobloop/producer_consumer.go
@@ -109,9 +109,11 @@ type producerConsumerJobImpl[T any] struct {
 func (j *ProducerConsumerJob[T]) produceOne(ctx context.Context, cfg jobConfig, annotateErrors bool) (T, prometheus.Labels, error) {
 	labels := j.Metadata.makeLabels(cfg)
 	task, err := j.DiscoverTask(ctx, labels)
-	if err != nil && !errors.Is(err, sql.ErrNoRows) && annotateErrors {
-		err = fmt.Errorf("could not select task%s for job %q: %w",
-			cfg.PrefilledLabelsAsString(), j.Metadata.ReadableName, err)
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		if annotateErrors {
+			err = fmt.Errorf("could not select task%s for job %q: %w",
+				cfg.PrefilledLabelsAsString(), j.Metadata.ReadableName, err)
+		}
 		j.Metadata.countTask(labels, err)
 	}
 	return task, labels, err