diff --git a/src/plugins/priority/basic/priority_basic.c b/src/plugins/priority/basic/priority_basic.c index 7d95e7044a43ec4453ca499ddde8d57fc43f9246..e9a52ad959afc4229d3884b5f61b9da397958dee 100644 --- a/src/plugins/priority/basic/priority_basic.c +++ b/src/plugins/priority/basic/priority_basic.c @@ -119,6 +119,7 @@ extern uint32_t priority_p_set(uint32_t last_prio, struct job_record *job_ptr) if (job_ptr->details) new_prio -= (job_ptr->details->nice - NICE_OFFSET); + /* System hold is priority 0 */ if (new_prio < 1) new_prio = 1; diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c index c296cb534b2dee571a977fe972234eb38f02b589..f48cb0971b5c477f3628e9e3787f931e0776655f 100644 --- a/src/plugins/priority/multifactor/priority_multifactor.c +++ b/src/plugins/priority/multifactor/priority_multifactor.c @@ -186,7 +186,7 @@ static int _apply_decay(double decay_factor) * This should be called every PriorityUsageResetPeriod * RET: SLURM_SUCCESS on SUCCESS, SLURM_ERROR else. */ -static int _reset_usage() +static int _reset_usage(void) { ListIterator itr = NULL; slurmdb_association_rec_t *assoc = NULL; @@ -554,11 +554,11 @@ static uint32_t _get_priority_internal(time_t start_time, memcpy(&pre_factors, job_ptr->prio_factors, sizeof(priority_factors_object_t)); - job_ptr->prio_factors->priority_age *= (double)weight_age; - job_ptr->prio_factors->priority_fs *= (double)weight_fs; - job_ptr->prio_factors->priority_js *= (double)weight_js; + job_ptr->prio_factors->priority_age *= (double)weight_age; + job_ptr->prio_factors->priority_fs *= (double)weight_fs; + job_ptr->prio_factors->priority_js *= (double)weight_js; job_ptr->prio_factors->priority_part *= (double)weight_part; - job_ptr->prio_factors->priority_qos *= (double)weight_qos; + job_ptr->prio_factors->priority_qos *= (double)weight_qos; priority = job_ptr->prio_factors->priority_age + job_ptr->prio_factors->priority_fs