From 10678525b0484ce5a06f643be2ce9f4fab2d4357 Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Fri, 20 Jan 2017 13:59:13 +0100 Subject: Fix shared runners queue update --- app/services/ci/update_build_queue_service.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index 2e901016666..d57adf27104 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -6,6 +6,12 @@ module Ci runner.tick_runner_queue end end + + Ci::Runner.shared.each do |runner| + if runner.can_pick?(build) + runner.tick_runner_queue + end + end if build.project.shared_runners_enabled? end end end -- cgit v1.2.3 From ecb9f978eba1f1693f30e36428f3ace9b59af1e7 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 20 Jan 2017 14:16:13 +0100 Subject: Improve readability of runner tick queue method --- app/models/ci/runner.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb index 6e58a1878c8..ed1843ba005 100644 --- a/app/models/ci/runner.rb +++ b/app/models/ci/runner.rb @@ -126,9 +126,11 @@ module Ci end def tick_runner_queue - new_update = SecureRandom.hex - Gitlab::Redis.with { |redis| redis.set(runner_queue_key, new_update, ex: RUNNER_QUEUE_EXPIRY_TIME) } - new_update + SecureRandom.hex.tap do |new_update| + Gitlab::Redis.with do |redis| + redis.set(runner_queue_key, new_update, ex: RUNNER_QUEUE_EXPIRY_TIME) + end + end end def ensure_runner_queue_value -- cgit v1.2.3 From a5ab418c370d79b3fe7e82ad00c47459ade678d8 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Fri, 20 Jan 2017 14:32:32 +0100 Subject: Add missing specs for update build queue service --- app/services/ci/update_build_queue_service.rb | 4 +- .../services/ci/update_build_queue_service_spec.rb | 47 ++++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 spec/services/ci/update_build_queue_service_spec.rb diff --git a/app/services/ci/update_build_queue_service.rb b/app/services/ci/update_build_queue_service.rb index d57adf27104..152c8ae5006 100644 --- a/app/services/ci/update_build_queue_service.rb +++ b/app/services/ci/update_build_queue_service.rb @@ -7,11 +7,13 @@ module Ci end end + return unless build.project.shared_runners_enabled? + Ci::Runner.shared.each do |runner| if runner.can_pick?(build) runner.tick_runner_queue end - end if build.project.shared_runners_enabled? + end end end end diff --git a/spec/services/ci/update_build_queue_service_spec.rb b/spec/services/ci/update_build_queue_service_spec.rb new file mode 100644 index 00000000000..f01a388b895 --- /dev/null +++ b/spec/services/ci/update_build_queue_service_spec.rb @@ -0,0 +1,47 @@ +require 'spec_helper' + +describe Ci::UpdateBuildQueueService, :services do + let(:project) { create(:project) } + let(:build) { create(:ci_build, pipeline: pipeline) } + let(:pipeline) { create(:ci_pipeline, project: project) } + + context 'when updating specific runners' do + let(:runner) { create(:ci_runner) } + + context 'when there are runner that can pick build' do + before { build.project.runners << runner } + + it 'ticks runner queue value' do + expect { subject.execute(build) } + .to change { runner.ensure_runner_queue_value } + end + end + + context 'when there are no runners that can pick build' do + it 'does not tick runner queue value' do + expect { subject.execute(build) } + .not_to change { runner.ensure_runner_queue_value } + end + end + end + + context 'when updating shared runners' do + let(:runner) { create(:ci_runner, :shared) } + + context 'when there are runner that can pick build' do + it 'ticks runner queue value' do + expect { subject.execute(build) } + .to change { runner.ensure_runner_queue_value } + end + end + + context 'when there are no runners that can pick build' do + before { build.tag_list = [:docker] } + + it 'does not tick runner queue value' do + expect { subject.execute(build) } + .not_to change { runner.ensure_runner_queue_value } + end + end + end +end -- cgit v1.2.3