Queue ordering - sort by PR then commit_type & updated diagram

Author: Jamesbarford

site/src/job_queue.rs

@@ -80,13 +80,14 @@ fn sort_benchmark_requests(done: &HashSet<String>, request_queue: &mut [Benchmar
         let level = &mut request_queue[finished..][..level_len];
         level.sort_unstable_by_key(|bmr| {
             (
+                // Pr number takes priority
+                *bmr.pr().unwrap_or(&0),
                 // Order master commits before try commits
                 match bmr.commit_type {
                     BenchmarkRequestType::Try { .. } => 1,
                     BenchmarkRequestType::Master { .. } => 0,
                     BenchmarkRequestType::Release { .. } => unreachable!(),
                 },
-                *bmr.pr().unwrap_or(&0),
                 bmr.created_at,
             )
         });
@@ -534,15 +535,15 @@ mod tests {
              *             | m "rrr" C | -----+-->
              *             +-----------+      |
              *                                |    +---------------+
-             *                                +--->| t "yee" R pr1 | 6: a try with a low pr
+             *                                +--->| t "yee" R pr1 | 3: a try with a low pr
              *                                     +---------------+
              *             +-----------+
              *             | m "aaa" C |
              *             +-----------+
              *                   |
              *                   V
              *           +----------------+
-             *           | m "mmm" R pr88 | 4: a master commit
+             *           | m "mmm" R pr88 | 6: a master commit
              *           +----------------+
              *
              *             +-----------+
@@ -551,7 +552,7 @@ mod tests {
              *                   |
              *                   V
              *           +----------------+
-             *           | m "123" R pr11 | 3: a master commit
+             *           | m "123" R pr11 | 4: a master commit, high pr number
              *           +----------------+
              *
              *
@@ -561,12 +562,12 @@ mod tests {
              *                   |
              *                   V
              *           +----------------+
-             *           | m "foo" R pr77 | 4: a master commit
+             *           | m "foo" R pr77 | 5: a master commit
              *           +----------------+
              *                   |
              *                   V
              *           +---------------+
-             *           | t "baz" R pr4 | 7: a try with a higher pr
+             *           | t "baz" R pr4 | 7: a try with a low pr, blocked by parent
              *           +---------------+
              *
              *  The master commits should take priority, then "yee" followed
@@ -597,7 +598,7 @@ mod tests {
 
             queue_order_matches(
                 &sorted,
-                &["t1", "v.1.2.3", "123", "foo", "mmm", "yee", "baz"],
+                &["t1", "v.1.2.3", "yee", "123", "foo", "mmm", "baz"],
             );
             Ok(ctx)
         })