97731760d7
Dumping too many jobs in the same queue (e.g. the "default" queue) is a dangerous setup. Jobs that take a long time to process can effectively block any other work from being performed given there are enough of these jobs. Furthermore it becomes harder to monitor the jobs as a single queue could contain jobs for different workers. In such a setup the only reliable way of getting counts per job is to iterate over all jobs in a queue, which is a rather time consuming process. By using separate queues for various workers we have better control over throughput, we can add weight to queues, and we can monitor queues better. Some workers still use the same queue whenever their work is related. For example, the various CI pipeline workers use the same "pipeline" queue. This commit includes a Rails migration that moves Sidekiq jobs from the old queues to the new ones. This migration also takes care of doing the inverse if ever needed. This does require downtime as otherwise new jobs could be scheduled in the old queues after this migration completes. This commit also includes an RSpec test that blacklists the use of the "default" queue and ensures cron workers use the "cronjob" queue. Fixes gitlab-org/gitlab-ce#23370
54 lines
2.1 KiB
Ruby
54 lines
2.1 KiB
Ruby
class EmailReceiverWorker
|
|
include Sidekiq::Worker
|
|
include DedicatedSidekiqQueue
|
|
|
|
def perform(raw)
|
|
return unless Gitlab::IncomingEmail.enabled?
|
|
|
|
begin
|
|
Gitlab::Email::Receiver.new(raw).execute
|
|
rescue => e
|
|
handle_failure(raw, e)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def handle_failure(raw, e)
|
|
Rails.logger.warn("Email can not be processed: #{e}\n\n#{raw}")
|
|
|
|
return unless raw.present?
|
|
|
|
can_retry = false
|
|
reason =
|
|
case e
|
|
when Gitlab::Email::UnknownIncomingEmail
|
|
"We couldn't figure out what the email is for. Please create your issue or comment through the web interface."
|
|
when Gitlab::Email::SentNotificationNotFoundError
|
|
"We couldn't figure out what the email is in reply to. Please create your comment through the web interface."
|
|
when Gitlab::Email::ProjectNotFound
|
|
"We couldn't find the project. Please check if there's any typo."
|
|
when Gitlab::Email::EmptyEmailError
|
|
can_retry = true
|
|
"It appears that the email is blank. Make sure your reply is at the top of the email, we can't process inline replies."
|
|
when Gitlab::Email::AutoGeneratedEmailError
|
|
"The email was marked as 'auto generated', which we can't accept. Please create your comment through the web interface."
|
|
when Gitlab::Email::UserNotFoundError
|
|
"We couldn't figure out what user corresponds to the email. Please create your comment through the web interface."
|
|
when Gitlab::Email::UserBlockedError
|
|
"Your account has been blocked. If you believe this is in error, contact a staff member."
|
|
when Gitlab::Email::UserNotAuthorizedError
|
|
"You are not allowed to perform this action. If you believe this is in error, contact a staff member."
|
|
when Gitlab::Email::NoteableNotFoundError
|
|
"The thread you are replying to no longer exists, perhaps it was deleted? If you believe this is in error, contact a staff member."
|
|
when Gitlab::Email::InvalidNoteError,
|
|
Gitlab::Email::InvalidIssueError
|
|
can_retry = true
|
|
e.message
|
|
end
|
|
|
|
if reason
|
|
EmailRejectionMailer.rejection(reason, raw, can_retry).deliver_later
|
|
end
|
|
end
|
|
end
|