Skip to content
Snippets Groups Projects
Commit f2a08ce7 authored by Morris Jette's avatar Morris Jette
Browse files

select/serial gres scheduling fix

Equivalent fix as e1a00772
for select/serial rather than select/cons_res
parent 93ead71a
No related branches found
No related tags found
No related merge requests found
...@@ -127,6 +127,11 @@ uint16_t _can_job_run_on_node(struct job_record *job_ptr, bitstr_t *core_map, ...@@ -127,6 +127,11 @@ uint16_t _can_job_run_on_node(struct job_record *job_ptr, bitstr_t *core_map,
gres_plugin_job_core_filter(job_ptr->gres_list, gres_list, test_only, gres_plugin_job_core_filter(job_ptr->gres_list, gres_list, test_only,
core_map, core_start_bit, core_end_bit, core_map, core_start_bit, core_end_bit,
node_ptr->name); node_ptr->name);
gres_cores = gres_plugin_job_test(job_ptr->gres_list,
gres_list, test_only,
core_map, core_start_bit,
core_end_bit, job_ptr->job_id,
node_ptr->name);
if ((cr_type & CR_MEMORY) && cpus) { if ((cr_type & CR_MEMORY) && cpus) {
req_mem = job_ptr->details->pn_min_memory & ~MEM_PER_CPU; req_mem = job_ptr->details->pn_min_memory & ~MEM_PER_CPU;
...@@ -137,11 +142,6 @@ uint16_t _can_job_run_on_node(struct job_record *job_ptr, bitstr_t *core_map, ...@@ -137,11 +142,6 @@ uint16_t _can_job_run_on_node(struct job_record *job_ptr, bitstr_t *core_map,
cpus = 0; cpus = 0;
} }
gres_cores = gres_plugin_job_test(job_ptr->gres_list,
gres_list, test_only,
core_map, core_start_bit,
core_end_bit, job_ptr->job_id,
node_ptr->name);
gres_cpus = gres_cores; gres_cpus = gres_cores;
if (gres_cpus != NO_VAL) if (gres_cpus != NO_VAL)
gres_cpus *= cpus_per_core; gres_cpus *= cpus_per_core;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment