diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 11:43:02 +0300 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /lib/gitlab/sidekiq_enq.rb | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'lib/gitlab/sidekiq_enq.rb')
-rw-r--r-- | lib/gitlab/sidekiq_enq.rb | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_enq.rb b/lib/gitlab/sidekiq_enq.rb new file mode 100644 index 00000000000..d8a01ac8ef4 --- /dev/null +++ b/lib/gitlab/sidekiq_enq.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +# This is a copy of https://github.com/mperham/sidekiq/blob/32c55e31659a1e6bd42f98334cca5eef2863de8d/lib/sidekiq/scheduled.rb#L11-L34 +# +# It effectively reverts +# https://github.com/mperham/sidekiq/commit/9b75467b33759888753191413eddbc15c37a219e +# because we observe that the extra ZREMs caused by this change can lead to high +# CPU usage on Redis at peak times: +# https://gitlab.com/gitlab-com/gl-infra/scalability/-/issues/1179 +# +module Gitlab + class SidekiqEnq + def enqueue_jobs(now = Time.now.to_f.to_s, sorted_sets = Sidekiq::Scheduled::SETS) + # A job's "score" in Redis is the time at which it should be processed. + # Just check Redis for the set of jobs with a timestamp before now. + Sidekiq.redis do |conn| + sorted_sets.each do |sorted_set| + start_time = ::Gitlab::Metrics::System.monotonic_time + jobs = redundant_jobs = 0 + + Sidekiq.logger.info(message: 'Enqueuing scheduled jobs', status: 'start', sorted_set: sorted_set) + + # Get the next item in the queue if it's score (time to execute) is <= now. + # We need to go through the list one at a time to reduce the risk of something + # going wrong between the time jobs are popped from the scheduled queue and when + # they are pushed onto a work queue and losing the jobs. + while (job = conn.zrangebyscore(sorted_set, "-inf", now, limit: [0, 1]).first) + + # Pop item off the queue and add it to the work queue. If the job can't be popped from + # the queue, it's because another process already popped it so we can move on to the + # next one. + if conn.zrem(sorted_set, job) + jobs += 1 + Sidekiq::Client.push(Sidekiq.load_json(job)) + else + redundant_jobs += 1 + end + end + + end_time = ::Gitlab::Metrics::System.monotonic_time + Sidekiq.logger.info(message: 'Enqueuing scheduled jobs', + status: 'done', + sorted_set: sorted_set, + jobs_count: jobs, + redundant_jobs_count: redundant_jobs, + duration_s: end_time - start_time) + end + end + end + end +end |