From bd82a54e2eed1dc704e503cb891d3f17cba4b3d6 Mon Sep 17 00:00:00 2001
From: Christopher Moussa <moussa1@llnl.gov>
Date: Mon, 14 Feb 2022 08:13:47 -0800
Subject: [PATCH] plugin: add queue_factor to priority calculation

---
 src/plugins/mf_priority.cpp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/plugins/mf_priority.cpp b/src/plugins/mf_priority.cpp
index f49194978..de18901b3 100644
--- a/src/plugins/mf_priority.cpp
+++ b/src/plugins/mf_priority.cpp
@@ -62,7 +62,11 @@ struct queue_info {
  *
  * fairshare: the ratio between the amount of resources allocated vs. resources
  *     consumed.
+ *
  * urgency: a user-controlled factor to prioritize their own jobs.
+ *
+ * queue: a factor that can further increase or decrease the priority of a job
+ *     based on the queue passed in.
  */
 int64_t priority_calculation (flux_plugin_t *p,
                               flux_plugin_arg_t *args,
@@ -71,10 +75,12 @@ int64_t priority_calculation (flux_plugin_t *p,
                               int urgency)
 {
     double fshare_factor = 0.0, priority = 0.0;
-    int fshare_weight;
+    int queue_factor = 0;
+    int fshare_weight, queue_weight;
     struct bank_info *b;
 
     fshare_weight = 100000;
+    queue_weight = 10000;
 
     if (urgency == FLUX_JOB_URGENCY_HOLD)
         return FLUX_JOB_PRIORITY_MIN;
@@ -95,10 +101,16 @@ int64_t priority_calculation (flux_plugin_t *p,
     }
 
     fshare_factor = b->fairshare;
+    queue_factor = b->queue_factor;
 
-    priority = (fshare_weight * fshare_factor) + (urgency - 16);
+    priority = round ((fshare_weight * fshare_factor) +
+                      (queue_weight * queue_factor) +
+                      (urgency - 16));
+
+    if (priority < 0)
+        return FLUX_JOB_PRIORITY_MIN;
 
-    return abs (round (priority));
+    return priority;
 }