diff --git a/NEWS b/NEWS index 9b4a5e99ec15eaf0cdb68adacccbf93d20dff4bd..23b01b6d79a12d95da425067ea0c15075c6838be 100644 --- a/NEWS +++ b/NEWS @@ -3,8 +3,6 @@ documents those changes that are of interest to users and administrators. * Changes in Slurm 14.11.9 ========================== - -- Do not count slurmctld threads waiting in a "throttle" lock against the - daemon's thread limit as they are not contending for resources. -- Correct "sdiag" backfill cycle time calculation if it yields locks. A microsecond value was being treated as a second value resulting in an overflow in the calcuation. diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c index 1a23dd4238a3242f33cf6233ae3e928cce0d2bc6..92e3697b11419834564cfed4a131592f75530a91 100644 --- a/src/slurmctld/proc_req.c +++ b/src/slurmctld/proc_req.c @@ -565,13 +565,7 @@ static void _throttle_start(int *active_rpc_cnt) (*active_rpc_cnt)++; break; } - - /* While an RPC is being throttled due to a running RPC of the - * same type, do not count that thread against the daemon's - * thread limit */ - server_thread_decr(); pthread_cond_wait(&throttle_cond, &throttle_mutex); - server_thread_incr(); } slurm_mutex_unlock(&throttle_mutex); if (LOTS_OF_AGENTS)