FIX: Unicorn master and Sidekiq reopening logs at the same time (#29137)
In our production environment, we have been seeing Sidekiq processes getting stuck randomly when a USR1 signal is sent to the Unicorn master process. We have not been able to identify the root cause of why the Sidekiq process gets stuck. We however noticed that when the Unicorn master process receives a USR1 signal, it will reopen the logs for the Unicorn master process first before sending a USR1 signal for the Unicorn worker processes to reopen the logs. We figured that we should do the same for the Sidekiq process as well when a USR1 signal. In this commit, we introduce an arbitrary delay of 1 second before we the Sidekiq process reopens its log files so as to allow enough time for the Unicorn master to finish reopening it logs first. We also do not send reopen logs for the Sidekiq process if the `DISCOURSE_LOG_SIDEKIQ` env is not present because there is no need to reopen any logs.
This commit is contained in:
parent
08d5cf01cd
commit
c1f25cdf5b
|
@ -150,7 +150,7 @@ module Jobs
|
||||||
end
|
end
|
||||||
|
|
||||||
def enabled?
|
def enabled?
|
||||||
ENV["DISCOURSE_LOG_SIDEKIQ"] == "1"
|
Discourse.enable_sidekiq_logging?
|
||||||
end
|
end
|
||||||
|
|
||||||
def live_slots_limit
|
def live_slots_limit
|
||||||
|
|
|
@ -89,13 +89,22 @@ before_fork do |server, worker|
|
||||||
Demon::Sidekiq.after_fork { DiscourseEvent.trigger(:sidekiq_fork_started) }
|
Demon::Sidekiq.after_fork { DiscourseEvent.trigger(:sidekiq_fork_started) }
|
||||||
Demon::Sidekiq.start(sidekiqs, logger: server.logger)
|
Demon::Sidekiq.start(sidekiqs, logger: server.logger)
|
||||||
|
|
||||||
# Trap USR1, so we can re-issue to sidekiq workers
|
if Discourse.enable_sidekiq_logging?
|
||||||
# but chain the default unicorn implementation as well
|
# Trap USR1, so we can re-issue to sidekiq workers
|
||||||
old_handler =
|
# but chain the default unicorn implementation as well
|
||||||
Signal.trap("USR1") do
|
old_handler =
|
||||||
Demon::Sidekiq.kill("USR1")
|
Signal.trap("USR1") do
|
||||||
old_handler.call
|
old_handler.call
|
||||||
end
|
|
||||||
|
# We have seen Sidekiq processes getting stuck in production sporadically when log rotation happens.
|
||||||
|
# The cause is currently unknown but we suspect that it is related to the Unicorn master process and
|
||||||
|
# Sidekiq demon processes reopening logs at the same time as we noticed that Unicorn worker processes only
|
||||||
|
# reopen logs after the Unicorn master process is done. To workaround the problem, we are adding an arbitrary
|
||||||
|
# delay of 1 second to Sidekiq's log reopeing procedure. The 1 second delay should be
|
||||||
|
# more than enough for the Unicorn master process to finish reopening logs.
|
||||||
|
Demon::Sidekiq.kill("USR2")
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if ENV["DISCOURSE_ENABLE_EMAIL_SYNC_DEMON"] == "true"
|
if ENV["DISCOURSE_ENABLE_EMAIL_SYNC_DEMON"] == "true"
|
||||||
|
|
|
@ -34,19 +34,11 @@ class Demon::Sidekiq < ::Demon::Base
|
||||||
cli = Sidekiq::CLI.instance
|
cli = Sidekiq::CLI.instance
|
||||||
|
|
||||||
# Unicorn uses USR1 to indicate that log files have been rotated
|
# Unicorn uses USR1 to indicate that log files have been rotated
|
||||||
Signal.trap("USR1") do
|
Signal.trap("USR1") { reopen_logs }
|
||||||
begin
|
|
||||||
log_in_trap("Sidekiq reopening logs...")
|
|
||||||
Unicorn::Util.reopen_logs
|
|
||||||
log_in_trap("Sidekiq done reopening logs...")
|
|
||||||
rescue => error
|
|
||||||
log_in_trap(
|
|
||||||
"Error encountered while reopening logs: [#{error.class}] #{error.message}\n#{error.backtrace.join("\n")}",
|
|
||||||
level: :error,
|
|
||||||
)
|
|
||||||
|
|
||||||
exit 1
|
Signal.trap("USR2") do
|
||||||
end
|
sleep 1
|
||||||
|
reopen_logs
|
||||||
end
|
end
|
||||||
|
|
||||||
options = ["-c", GlobalSetting.sidekiq_workers.to_s]
|
options = ["-c", GlobalSetting.sidekiq_workers.to_s]
|
||||||
|
@ -75,4 +67,21 @@ class Demon::Sidekiq < ::Demon::Base
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def reopen_logs
|
||||||
|
begin
|
||||||
|
log_in_trap("Sidekiq reopening logs...")
|
||||||
|
Unicorn::Util.reopen_logs
|
||||||
|
log_in_trap("Sidekiq done reopening logs...")
|
||||||
|
rescue => error
|
||||||
|
log_in_trap(
|
||||||
|
"Error encountered while reopening logs: [#{error.class}] #{error.message}\n#{error.backtrace.join("\n")}",
|
||||||
|
level: :error,
|
||||||
|
)
|
||||||
|
|
||||||
|
exit 1
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1223,4 +1223,8 @@ module Discourse
|
||||||
) if SiteSetting.set_locale_from_accept_language_header
|
) if SiteSetting.set_locale_from_accept_language_header
|
||||||
locale
|
locale
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.enable_sidekiq_logging?
|
||||||
|
ENV["DISCOURSE_LOG_SIDEKIQ"] == "1"
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue