diff --git a/NEWS b/NEWS index e8b063fcb47ae0e5b8375b4b47b423533efac0e5..2a24967ead6290b4a43c73315c21ae6e6af0e02a 100644 --- a/NEWS +++ b/NEWS @@ -326,11 +326,15 @@ documents those changes that are of interest to users and admins. -- Sched/backfill - Change default max_job_bf parameter from 50 to 100. -- Added -I|--item-extract option to sh5util to extract data item from series. +* Changes in Slurm 2.6.10 +========================= + * Changes in Slurm 2.6.9 ======================== -- Fix sinfo to work correctly with draining/mixed nodes as well as filtering on Mixed state. -- Fix sacctmgr update user with no "where" condition. + -- Fix logic bugs for SchedulerParameters option of max_rpc_cnt. * Changes in Slurm 2.6.8 ======================== diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c index f6a7c0e43b9f446bc138789367bffd708dacff0b..efba24af4e2dcb82fc0b7ecdc0145c796578eca0 100644 --- a/src/plugins/sched/backfill/backfill.c +++ b/src/plugins/sched/backfill/backfill.c @@ -250,7 +250,8 @@ static bool _job_is_completing(void) static bool _many_pending_rpcs(void) { //info("thread_count = %u", slurmctld_config.server_thread_count); - if (slurmctld_config.server_thread_count >= defer_rpc_cnt) + if ((defer_rpc_cnt > 0) && + (slurmctld_config.server_thread_count >= defer_rpc_cnt)) return true; return false; } diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c index 686b5ed3a31d9c761f8935a585efb2023cadfad1..708496466d843e12ace102a9dde5cc94c626d3dd 100644 --- a/src/slurmctld/proc_req.c +++ b/src/slurmctld/proc_req.c @@ -3000,7 +3000,7 @@ static void _slurm_rpc_submit_batch_job(slurm_msg_t * msg) if (error_code == SLURM_SUCCESS) { error_code = validate_job_create_req(job_desc_msg); if (job_desc_msg->array_bitmap) - schedule_cnt = 0; /* Do full schedule cycle */ + schedule_cnt = 100; } dump_job_desc(job_desc_msg); if (error_code == SLURM_SUCCESS) {