summaryrefslogtreecommitdiff
path: root/spec/models/ci
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-07-21 23:00:37 -0700
committerStan Hu <stanhu@gmail.com>2019-07-22 10:23:07 -0700
commit583c12acf44ba18adea45eb0e61f287861c44e43 (patch)
treebd8e973c57a2c50396f0286b376713f30ec2abcb /spec/models/ci
parent3cc5535c0c7a52c93b00c1a1260eb8d828a3e9dc (diff)
downloadgitlab-ce-583c12acf44ba18adea45eb0e61f287861c44e43.tar.gz
Use persistent Redis cluster for Workhorse pub/sub notificationssh-use-shared-state-cluster-pubsub
Previously, in Omnibus, Workhorse expected to listen via the Redis shared state cluster for the `workhorse:notifications` publish/subscribe channel, but the Rails code was using the Sidekiq queue cluster for this. To fix this inconsistency, we make the Rails code use the persistent cluster, since we don't want Workhorse to be looking at anything Sidekiq-related.
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/runner_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb
index f735a89f69f..24ea059e871 100644
--- a/spec/models/ci/runner_spec.rb
+++ b/spec/models/ci/runner_spec.rb
@@ -554,7 +554,7 @@ describe Ci::Runner do
end
def expect_value_in_queues
- Gitlab::Redis::Queues.with do |redis|
+ Gitlab::Redis::SharedState.with do |redis|
runner_queue_key = runner.send(:runner_queue_key)
expect(redis.get(runner_queue_key))
end
@@ -627,7 +627,7 @@ describe Ci::Runner do
end
it 'cleans up the queue' do
- Gitlab::Redis::Queues.with do |redis|
+ Gitlab::Redis::SharedState.with do |redis|
expect(redis.get(queue_key)).to be_nil
end
end