qmanager: rename urgency to priority

In a number of locations, urgency was used as a variable name instead of
priority to store the job priority.  Update variable names accordingly.
Update queue sorting to use maximum priority of 4294967295 instead of
maximum urgency of 31.

Fixes flux-framework#798

qmanager/modules/qmanager_callbacks.cpp

@@ -166,11 +166,13 @@ int qmanager_cb_t::jobmanager_hello_cb (flux_t *h, const flux_msg_t *msg,
     queue_name = qn_attr? qn_attr : ctx->opts.get_opt ().get_default_queue ();
     json_decref (o);
     queue = ctx->queues.at (queue_name);
-    // Note that RFC27 defines 31 as the max urgency. Because our queue policy
-    // layer sorts the pending jobs in lexicographical order
-    // (<urgency, t_submit, ...> and lower the better, we adjust urgency.
+    // Note that RFC27 defines 4294967295 as the max priority. Because
+    // our queue policy layer sorts the pending jobs in
+    // lexicographical order (<priority, t_submit, ...>) and lower the
+    // better, we adjust priority.
     running_job = std::make_shared<job_t> (job_state_kind_t::RUNNING,
-                                                   id, uid, 31 - prio, ts, R);
+                                                   id, uid, 4294967295 - prio,
+                                                   ts, R);
 
     if ( (rc = queue->reconstruct (static_cast<void *> (h),
                                    running_job, R_out)) < 0) {
@@ -199,7 +201,7 @@ void qmanager_cb_t::jobmanager_alloc_cb (flux_t *h, const flux_msg_t *msg,
     if (flux_msg_unpack (msg,
                          "{s:I s:i s:i s:f s:o}",
                          "id", &job->id,
-                         "priority", &job->urgency,
+                         "priority", &job->priority,
                          "userid", &job->userid,
                          "t_submit", &job->t_submit,
                          "jobspec", &jobspec) < 0) {
@@ -216,10 +218,11 @@ void qmanager_cb_t::jobmanager_alloc_cb (flux_t *h, const flux_msg_t *msg,
         queue_name = jobspec_obj.attributes.system.queue;
     job->jobspec = jobspec_str;
     free (jobspec_str);
-    // Note that RFC27 defines 31 as the max urgency. Because our queue policy
-    // layer sorts the pending jobs in lexicographical order
-    // (<urgency, t_submit, ...> and lower the better, we adjust the urgency.
-    job->urgency = 31 - job->urgency;
+    // Note that RFC27 defines 4294967295 as the max priority. Because
+    // our queue policy layer sorts the pending jobs in
+    // lexicographical order (<priority, t_submit, ...> and lower the
+    // better, we adjust the priority.
+    job->priority = 4294967295 - job->priority;
     if (ctx->queues.find (queue_name) == ctx->queues.end ()) {
         if (schedutil_alloc_respond_deny (ctx->schedutil, msg, NULL) < 0)
             flux_log_error (h, "%s: schedutil_alloc_respond_deny",

qmanager/policies/base/queue_policy_base.hpp

@@ -85,9 +85,9 @@ class job_t {
     ~job_t () { flux_msg_destroy (msg); }
     job_t () = default;
     job_t (job_state_kind_t s, flux_jobid_t jid,
-           uint32_t uid, unsigned int u, double t_s, const std::string &R)
+           uint32_t uid, unsigned int p, double t_s, const std::string &R)
 	   : state (s), id (jid), userid (uid),
-	     urgency (u), t_submit (t_s), schedule (R) { }
+	     priority (p), t_submit (t_s), schedule (R) { }
     job_t (job_t &&j) = default;
     job_t (const job_t &j) = default;
     job_t& operator= (job_t &&s) = default;
@@ -99,7 +99,7 @@ class job_t {
     job_state_kind_t state = job_state_kind_t::INIT;
     flux_jobid_t id = 0;
     uint32_t userid = 0;
-    unsigned int urgency = 0;
+    unsigned int priority = 0;
     double t_submit = 0.0f;;
     std::string jobspec = "";
     std::string note = "";

qmanager/policies/base/queue_policy_base_impl.hpp

@@ -253,7 +253,7 @@ int queue_policy_base_impl_t::insert (std::shared_ptr<job_t> job)
     job->state = job_state_kind_t::PENDING;
     job->t_stamps.pending_ts = m_pq_cnt++;
     m_pending.insert (std::pair<std::vector<double>, flux_jobid_t> (
-        {static_cast<double> (job->urgency),
+        {static_cast<double> (job->priority),
          static_cast<double> (job->t_submit),
          static_cast<double> (job->t_stamps.pending_ts)}, job->id));
     m_jobs.insert (std::pair<flux_jobid_t, std::shared_ptr<job_t>> (job->id,
@@ -276,7 +276,7 @@ int queue_policy_base_impl_t::remove (flux_jobid_t id)
     job = m_jobs[id];
     switch (job->state) {
     case job_state_kind_t::PENDING:
-        m_pending.erase ({static_cast<double> (job->urgency),
+        m_pending.erase ({static_cast<double> (job->priority),
                           static_cast<double> (job->t_submit),
                           static_cast<double> (job->t_stamps.pending_ts)});
         job->state = job_state_kind_t::CANCELED;
@@ -421,7 +421,7 @@ std::shared_ptr<job_t> queue_policy_base_impl_t::pending_pop ()
     if (m_jobs.find (id) == m_jobs.end ())
         return nullptr;
     job = m_jobs[id];
-    m_pending.erase ({static_cast<double> (job->urgency),
+    m_pending.erase ({static_cast<double> (job->priority),
                       static_cast<double> (job->t_submit),
                       static_cast<double> (job->t_stamps.pending_ts)});
     m_jobs.erase (id);