A platform for community discussion. Free, open, simple.
FIX: Let thread pools terminate after draining queued work (#44814)
Alan Guo Xiang Tan357672b625e0
diff --git a/lib/scheduler/thread_pool.rb b/lib/scheduler/thread_pool.rbindex b4a39ed8b1c..d1ce807ae87 100644--- a/lib/scheduler/thread_pool.rb+++ b/lib/scheduler/thread_pool.rb@@ -148,7 +148,7 @@ module Scheduler@busy_threads << Thread.current if work- if !done && work && @queue.length > 0 && @threads.length < @max_threads &&+ if !done && !@shutdown && work && @queue.length > 0 && @threads.length < @max_threads &&@busy_threads.length == @threads.lengthspawn_threadenddiff --git a/spec/lib/scheduler/thread_pool_spec.rb b/spec/lib/scheduler/thread_pool_spec.rbindex 38965985408..758b2672b02 100644--- a/spec/lib/scheduler/thread_pool_spec.rb+++ b/spec/lib/scheduler/thread_pool_spec.rb@@ -144,6 +144,34 @@ RSpec.describe Scheduler::ThreadPool, type: :multisite doexpect(results2.size).to eq(3)expect(results2.sort).to eq([0, 1, 2])end++ context "when work is queued behind a busy worker" do+ let(:min_threads) { 1 }+ let(:max_threads) { 4 }+ let(:idle_time) { 30 }++ it "finishes queued work and terminates every worker" do+ started = Queue.new+ release = Queue.new+ completed = Queue.new+ pool.post do+ started << true+ release.pop+ completed << 0+ end+ expect(started.pop(timeout: 5)).to eq(true)+ 3.times { |index| pool.post { completed << index + 1 } }++ pool.shutdown+ release << true+ pool.wait_for_termination(timeout: 5)++ expect(4.times.map { completed.pop(timeout: 5) }).to eq([0, 1, 2, 3])+ expect(pool.stats[:thread_count]).to eq(0)+ ensure+ release&.push(true)+ end+ endenddescribe "error handling" do