diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/lib/gitlab/sidekiq_enq_spec.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/lib/gitlab/sidekiq_enq_spec.rb')
-rw-r--r-- | spec/lib/gitlab/sidekiq_enq_spec.rb | 93 |
1 files changed, 93 insertions, 0 deletions
diff --git a/spec/lib/gitlab/sidekiq_enq_spec.rb b/spec/lib/gitlab/sidekiq_enq_spec.rb new file mode 100644 index 00000000000..6903f01bf5f --- /dev/null +++ b/spec/lib/gitlab/sidekiq_enq_spec.rb @@ -0,0 +1,93 @@ +# frozen_string_literal: true + +require 'spec_helper' + +RSpec.describe Gitlab::SidekiqEnq, :clean_gitlab_redis_queues do + let(:retry_set) { Sidekiq::Scheduled::SETS.first } + let(:schedule_set) { Sidekiq::Scheduled::SETS.last } + + around do |example| + freeze_time { example.run } + end + + shared_examples 'finds jobs that are due and enqueues them' do + before do + Sidekiq.redis do |redis| + redis.zadd(retry_set, (Time.current - 1.day).to_f.to_s, '{"jid": 1}') + redis.zadd(retry_set, Time.current.to_f.to_s, '{"jid": 2}') + redis.zadd(retry_set, (Time.current + 1.day).to_f.to_s, '{"jid": 3}') + + redis.zadd(schedule_set, (Time.current - 1.day).to_f.to_s, '{"jid": 4}') + redis.zadd(schedule_set, Time.current.to_f.to_s, '{"jid": 5}') + redis.zadd(schedule_set, (Time.current + 1.day).to_f.to_s, '{"jid": 6}') + end + end + + it 'enqueues jobs that are due' do + expect(Sidekiq::Client).to receive(:push).with({ 'jid' => 1 }) + expect(Sidekiq::Client).to receive(:push).with({ 'jid' => 2 }) + expect(Sidekiq::Client).to receive(:push).with({ 'jid' => 4 }) + expect(Sidekiq::Client).to receive(:push).with({ 'jid' => 5 }) + + Gitlab::SidekiqEnq.new.enqueue_jobs + + Sidekiq.redis do |redis| + expect(redis.zscan_each(retry_set).map(&:first)).to contain_exactly('{"jid": 3}') + expect(redis.zscan_each(schedule_set).map(&:first)).to contain_exactly('{"jid": 6}') + end + end + end + + context 'when atomic_sidekiq_scheduler is disabled' do + before do + stub_feature_flags(atomic_sidekiq_scheduler: false) + end + + it_behaves_like 'finds jobs that are due and enqueues them' + + context 'when ZRANGEBYSCORE returns a job that is already removed by another process' do + before do + Sidekiq.redis do |redis| + redis.zadd(schedule_set, Time.current.to_f.to_s, '{"jid": 1}') + + allow(redis).to receive(:zrangebyscore).and_wrap_original do |m, *args, **kwargs| + m.call(*args, **kwargs).tap do |jobs| + redis.zrem(schedule_set, jobs.first) if args[0] == schedule_set && jobs.first + end + end + end + end + + it 'calls ZREM but does not enqueue the job' do + Sidekiq.redis do |redis| + expect(redis).to receive(:zrem).with(schedule_set, '{"jid": 1}').twice.and_call_original + end + expect(Sidekiq::Client).not_to receive(:push) + + Gitlab::SidekiqEnq.new.enqueue_jobs + end + end + end + + context 'when atomic_sidekiq_scheduler is enabled' do + before do + stub_feature_flags(atomic_sidekiq_scheduler: true) + end + + context 'when Lua script is not yet loaded' do + before do + Gitlab::Redis::Queues.with { |redis| redis.script(:flush) } + end + + it_behaves_like 'finds jobs that are due and enqueues them' + end + + context 'when Lua script is already loaded' do + before do + Gitlab::SidekiqEnq.new.enqueue_jobs + end + + it_behaves_like 'finds jobs that are due and enqueues them' + end + end +end |