mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-11-20 06:56:27 -05:00
Fix _maybe_grow_on_pressure burning cooldown at max threads
The CAS on _last_scale_time_usecs was performed before checking whether the pool was already at max_threads. When the pool was at capacity, the cooldown window was consumed but no thread was added. This suppressed legitimate scaling attempts from the monitor thread for the entire cooldown period. Move the CAS after the max-threads check and the _scaling_mutex acquisition so the cooldown is only claimed when a thread will actually be added. The mutex serializes concurrent callers, and the CAS still deduplicates concurrent pressure-grow attempts that pass the check simultaneously. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
111bedf2c9
commit
beb6961769
1 changed files with 15 additions and 13 deletions
|
|
@ -650,11 +650,6 @@ ThreadPool::_maybe_grow_on_pressure()
|
|||
if((now - last) < (std::uint64_t)_scaling_config.cooldown_usecs)
|
||||
return;
|
||||
|
||||
// CAS to claim the cooldown window — only one caller wins.
|
||||
if(!_last_scale_time_usecs.compare_exchange_strong(last,now,
|
||||
std::memory_order_relaxed))
|
||||
return;
|
||||
|
||||
// Hold _scaling_mutex so the thread-count check and add are atomic
|
||||
// with respect to other scaling operations.
|
||||
mutex_lockguard(_scaling_mutex);
|
||||
|
|
@ -665,14 +660,21 @@ ThreadPool::_maybe_grow_on_pressure()
|
|||
count = _threads.size();
|
||||
}
|
||||
|
||||
if(count < _scaling_config.max_threads)
|
||||
{
|
||||
_add_thread_scaling_locked({});
|
||||
syslog(LOG_DEBUG,
|
||||
"threadpool (%s): fast-path grow to %zu threads (queue full)",
|
||||
_name.c_str(),
|
||||
count + 1);
|
||||
}
|
||||
if(count >= _scaling_config.max_threads)
|
||||
return;
|
||||
|
||||
// CAS to claim the cooldown window — only one caller wins.
|
||||
// Done after the max-threads check so we don't burn the cooldown
|
||||
// when the pool is already at capacity.
|
||||
if(!_last_scale_time_usecs.compare_exchange_strong(last,now,
|
||||
std::memory_order_relaxed))
|
||||
return;
|
||||
|
||||
_add_thread_scaling_locked({});
|
||||
syslog(LOG_DEBUG,
|
||||
"threadpool (%s): fast-path grow to %zu threads (queue full)",
|
||||
_name.c_str(),
|
||||
count + 1);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue