DEV: Drop puma from `script/bench.rb`, default to Unicorn (#26898)

This commit updates `script/bench.rb` to only support Unicorn as the web
server. We don't intend to run Puma in production anytime soon so it is
pointless for us to maintain Puma related code.
This commit is contained in:
Alan Guo Xiang Tan 2024-05-07 12:27:29 +08:00 committed by GitHub
parent 0b947b6aab
commit 1dc31f242c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 14 additions and 30 deletions

View File

@ -37,7 +37,6 @@ opts =
ENV["DISCOURSE_DUMP_HEAP"] = "1"
end
o.on("-m", "--memory_stats") { @mem_stats = true }
o.on("-u", "--unicorn", "Use unicorn to serve pages as opposed to puma") { @unicorn = true }
o.on(
"-c",
"--concurrency [NUM]",
@ -207,12 +206,11 @@ begin
run("bundle exec rake assets:precompile")
end
pid =
if @unicorn
ENV["UNICORN_PORT"] = @port.to_s
ENV["UNICORN_WORKERS"] = @unicorn_workers.to_s
FileUtils.mkdir_p(File.join("tmp", "pids"))
unicorn_pid = spawn("bundle exec unicorn -c config/unicorn.conf.rb")
pid = spawn("bundle exec unicorn -c config/unicorn.conf.rb")
while (
unicorn_master_pid =
@ -221,19 +219,10 @@ begin
sleep 1
end
while `ps -f --ppid #{unicorn_master_pid} | grep worker | awk '{ print $2 }'`.split("\n")
.map(&:to_i)
.size != @unicorn_workers.to_i
while `pgrep -P #{unicorn_master_pid}`.split("\n").map(&:to_i).size != @unicorn_workers.to_i
sleep 1
end
unicorn_pid
else
spawn("bundle exec puma -p #{@port} -e production")
end
sleep 1 while port_available? @port
puts "Starting benchmark..."
admin_headers = { "Api-Key" => admin_api_key, "Api-Username" => "admin1" }
@ -296,12 +285,7 @@ begin
puts "Your Results: (note for timings- percentile is first, duration is second in millisecs)"
if @unicorn
puts "Unicorn: (workers: #{@unicorn_workers})"
else
# TODO we want to also bench puma clusters
puts "Puma: (single threaded)"
end
puts "Include env: #{@include_env}"
puts "Iterations: #{@iterations}, Best of: #{@best_of}"
puts "Concurrency: #{@concurrency}"