From fbc525d683021d1e2cf3f7cc9d2c54419e0b0ff3 Mon Sep 17 00:00:00 2001 From: lhofhansl Date: Thu, 27 Mar 2025 18:59:38 -0700 Subject: [PATCH] Restore behavior of emergequeue_limit_total (#15947) * And make sure `emergequeue_limit_total` is >= max(`emergequeue_limit_diskonly`, `emergequeue_limit_generate`) --- src/emerge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emerge.cpp b/src/emerge.cpp index 29134bccf..608bdb9a9 100644 --- a/src/emerge.cpp +++ b/src/emerge.cpp @@ -108,7 +108,7 @@ EmergeManager::EmergeManager(Server *server, MetricsBackend *mb) // don't trust user input for something very important like this m_qlimit_diskonly = rangelim(m_qlimit_diskonly, 2, 1000000); m_qlimit_generate = rangelim(m_qlimit_generate, 1, 1000000); - m_qlimit_total = std::max(m_qlimit_diskonly, m_qlimit_generate); + m_qlimit_total = std::max(m_qlimit_total, std::max(m_qlimit_diskonly, m_qlimit_generate)); for (s16 i = 0; i < nthreads; i++) m_threads.push_back(new EmergeThread(server, i));