edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

[Prod] Inline the memory calculation

Browse Source 
`Pitchfork::MemInfo` is not public. This also fixes the numbers being off by
a factor of 1024 since pitchfork returns kB, while unicorn-worker-killer used to handle bytes.

Add the amount of requests done after the worker get killed for memory reasons
This commit is contained in:
Earlopain 2024-05-08 16:35:11 +02:00
parent 401866b68a
commit e4a5764d0b
No known key found for this signature in database
GPG Key ID: 48860312319ADF61
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/pitchfork.rb
View File

@ -15,6 +15,12 @@ worker_processes ENV.fetch("PITCHFORK_WORKER_COUNT").to_i
WorkerData = Data.define(:max_requests, :max_mem) WorkerData = Data.define(:max_requests, :max_mem)
worker_data = nil worker_data = nil
def worker_pss(pid)
data = File.read("/proc/#{pid}/smaps_rollup")
pss_line = data.lines.find { |line| line.start_with?("Pss:") }
pss_line.split[1].to_i * 1024
end
after_worker_ready do |server, worker| after_worker_ready do |server, worker|
max_requests = Random.rand(5_000..10_000) max_requests = Random.rand(5_000..10_000)
max_mem = Random.rand((386 * (1024**2))..(768 * (1024**2))) max_mem = Random.rand((386 * (1024**2))..(768 * (1024**2)))
@ -30,9 +36,9 @@ after_request_complete do |server, worker, _env|
end end
if worker.requests_count % 16 == 0 if worker.requests_count % 16 == 0
mem_info = Pitchfork::MemInfo.new(worker.pid) pss_bytes = worker_pss(worker.pid)
if mem_info.pss > worker_data.max_mem if pss_bytes > worker_data.max_mem
server.logger.info("worker=#{worker.nr} gen=#{worker.generation}) exit: memory limit (#{mem_info.pss} bytes > #{worker_data.max_mem} bytes)") server.logger.info("worker=#{worker.nr} gen=#{worker.generation}) exit: memory limit (#{pss_bytes} bytes > #{worker_data.max_mem} bytes), after #{worker.requests_count} requests")
exit # rubocop:disable Rails/Exit exit # rubocop:disable Rails/Exit
end end
end end