Increment deque (retry) counter on job dequeue

Author: Kobzol

database/src/lib.rs

@@ -1112,7 +1112,7 @@ pub struct BenchmarkJob {
     benchmark_set: BenchmarkSet,
     created_at: DateTime<Utc>,
     status: BenchmarkJobStatus,
-    retry: u32,
+    deque_counter: u32,
 }
 
 impl BenchmarkJob {
@@ -1147,6 +1147,11 @@ impl BenchmarkJob {
             | BenchmarkJobStatus::Completed { collector_name, .. } => Some(collector_name),
         }
     }
+
+    /// How many times was the job already dequed?
+    pub fn deque_count(&self) -> u32 {
+        self.deque_counter
+    }
 }
 
 /// Describes the final state of a job

database/src/pool/postgres.rs

@@ -1840,6 +1840,7 @@ where
     ) -> anyhow::Result<Option<(BenchmarkJob, ArtifactId)>> {
         // We take the oldest job from the job_queue matching the benchmark_set,
         // target and status of 'queued'
+        // If a job was dequeued, we increment its retry (dequeue) count
         let row_opt = self
             .conn()
             .query_opt(
@@ -1863,7 +1864,8 @@ where
                     SET
                         collector_name = $4,
                         started_at = NOW(),
-                        status = $5
+                        status = $5,
+                        retry = retry + 1
                     FROM
                         picked
                     WHERE