diff --git a/src/common/job_resources.c b/src/common/job_resources.c index 4b78572a6370b680e6033ebd5a5fb9f134267945..0a9bb92b83cdf2113975dfd1af4d205cc769dfa2 100644 --- a/src/common/job_resources.c +++ b/src/common/job_resources.c @@ -593,7 +593,8 @@ extern void pack_job_resources(job_resources_t *job_resrcs_ptr, Buf buffer) xassert(job_resrcs_ptr->core_bitmap_used); pack_bit_str(job_resrcs_ptr->core_bitmap, buffer); pack_bit_str(job_resrcs_ptr->core_bitmap_used, buffer); - /* Do not pack the node_bitmap, but rebuild it in reset_node_bitmap() + /* Do not pack the node_bitmap, but rebuild it in + * reset_node_bitmap() * based upon job_ptr->nodes and the current node table */ } #endif diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c index ddd9661ded948e9f68944f7e8b9b031df6bf2c86..5ba13f30e1ab72108c563472ebe18b9a539ff13f 100644 --- a/src/plugins/select/bluegene/plugin/bg_job_place.c +++ b/src/plugins/select/bluegene/plugin/bg_job_place.c @@ -939,8 +939,7 @@ static int _find_best_block_match(List block_list, request.mloaderimage = mloaderimage; request.ramdiskimage = ramdiskimage; if(job_ptr->details->req_node_bitmap) - request.avail_node_bitmap = - job_ptr->details->req_node_bitmap; + request.avail_node_bitmap = job_ptr->details->req_node_bitmap; else request.avail_node_bitmap = slurm_block_bitmap; diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c index 7fcdf9d8b1c30a0d0c550d485968e10741f18d47..1457cb4f8e4ce31f0caaa24f1f451d629c6ade82 100644 --- a/src/plugins/select/bluegene/plugin/bg_record_functions.c +++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c @@ -688,7 +688,6 @@ extern int set_ionodes(bg_record_t *bg_record, int io_start, int io_nodes) bit_nset(bg_record->ionode_bitmap, io_start, io_start+io_nodes); bit_fmt(bitstring, BITSIZE, bg_record->ionode_bitmap); bg_record->ionodes = xstrdup(bitstring); - info("ionodes = %s", bg_record->ionodes); return SLURM_SUCCESS; } diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c index 369cfda7aa5f8e46a583147cf1f827e4d2fa560b..f65799f3de45964e6f76dcd003b2b64ac32bb3fd 100644 --- a/src/slurmctld/job_mgr.c +++ b/src/slurmctld/job_mgr.c @@ -4444,8 +4444,7 @@ void reset_job_bitmaps(void) job_ptr->nodes, job_ptr->job_id); job_fail = true; } - reset_node_bitmap(job_ptr->job_resrcs, - job_ptr->node_bitmap); + reset_node_bitmap(job_ptr->job_resrcs, job_ptr->node_bitmap); if (!job_fail && !IS_JOB_FINISHED(job_ptr) && job_ptr->job_resrcs && (cr_flag || gang_flag) && valid_job_resources(job_ptr->job_resrcs,