Automatic merge of gitlab-org/gitlab master

app/services/user_project_access_changed_service.rb

@@ -13,6 +13,7 @@ class UserProjectAccessChangedService
   def execute(blocking: true, priority: HIGH_PRIORITY)
     bulk_args = @user_ids.map { |id| [id] }
 
+    result =
       if blocking
         AuthorizedProjectsWorker.bulk_perform_and_wait(bulk_args)
       else
@@ -23,7 +24,9 @@ class UserProjectAccessChangedService
             DELAY, bulk_args, batch_size: 100, batch_delay: 30.seconds)
         end
       end
+
+    ::Gitlab::Database::LoadBalancing::Sticking.bulk_stick(:user, @user_ids)
+
+    result
   end
 end
-
-UserProjectAccessChangedService.prepend_mod_with('UserProjectAccessChangedService')

doc/administration/geo/setup/external_database.md

@@ -64,6 +64,7 @@ cloud providers:
 
 - Amazon RDS - [Creating a Read Replica](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html#USER_ReadRepl.Create)
 - Azure Database for PostgreSQL - [Create and manage read replicas in Azure Database for PostgreSQL](https://docs.microsoft.com/en-us/azure/postgresql/howto-read-replicas-portal)
+- Google Cloud SQL - [Creating read replicas](https://cloud.google.com/sql/docs/postgres/replication/create-replica)
 
 Once your read-only replica is set up, you can skip to [configure you secondary application node](#configure-secondary-application-nodes-to-use-the-external-read-replica).
 
@@ -182,6 +183,10 @@ to grant additional roles to your tracking database user (by default, this is
 
 - Amazon RDS requires the [`rds_superuser`](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Appendix.PostgreSQL.CommonDBATasks.html#Appendix.PostgreSQL.CommonDBATasks.Roles) role.
 - Azure Database for PostgreSQL requires the [`azure_pg_admin`](https://docs.microsoft.com/en-us/azure/postgresql/howto-create-users#how-to-create-additional-admin-users-in-azure-database-for-postgresql) role.
+- Google Cloud SQL requires the [`cloudsqlsuperuser`](https://cloud.google.com/sql/docs/postgres/users#default-users) role.
+
+This is for the installation of extensions during installation and upgrades. As an alternative,
+[ensure the extensions are installed manually, and read about the problems that may arise during future GitLab upgrades](../../../install/postgresql_extensions.md).
 
 If you have an external database ready to be used as the tracking database,
 follow the instructions below to use it:

ee/app/services/ee/user_project_access_changed_service.rb

-# frozen_string_literal: true
-
-module EE
-  module UserProjectAccessChangedService
-    def execute(blocking: true, priority: ::UserProjectAccessChangedService::HIGH_PRIORITY)
-      result = super
-
-      ::Gitlab::Database::LoadBalancing::Sticking.bulk_stick(:user, @user_ids) # rubocop:disable Gitlab/ModuleWithInstanceVariables
-
-      result
-    end
-  end
-end

ee/spec/services/ee/user_project_access_changed_service_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe EE::UserProjectAccessChangedService do
-  let(:service) { UserProjectAccessChangedService.new([1, 2]) }
-
-  describe '#execute' do
-    before do
-      allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
-
-      expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
-                                            .with([[1], [2]])
-                                            .and_return(10)
-    end
-
-    it 'sticks all the updated users and returns the original result', :aggregate_failures do
-      expect(Gitlab::Database::LoadBalancing::Sticking).to receive(:bulk_stick).with(:user, [1, 2])
-
-      expect(service.execute).to eq(10)
-    end
-
-    it 'avoids N+1 cached queries', :use_sql_query_cache, :request_store do
-      # Run this once to establish a baseline
-      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
-        service.execute
-      end
-
-      service = UserProjectAccessChangedService.new([1, 2, 3, 4, 5])
-
-      allow(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
-                                            .with([[1], [2], [3], [4], [5]])
-                                            .and_return(10)
-
-      expect { service.execute }.not_to exceed_all_query_limit(control_count.count)
-    end
-  end
-end

lib/gitlab/redis/cache.rb

 # frozen_string_literal: true
 
-# please require all dependencies below:
-require_relative 'wrapper' unless defined?(::Rails) && ::Rails.root.present?
-
 module Gitlab
   module Redis
     class Cache < ::Gitlab::Redis::Wrapper
       CACHE_NAMESPACE = 'cache:gitlab'
-      DEFAULT_REDIS_CACHE_URL = 'redis://localhost:6380'
-      REDIS_CACHE_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_CACHE_CONFIG_FILE'
 
       class << self
         def default_url
-          DEFAULT_REDIS_CACHE_URL
-        end
-
-        def config_file_name
-          # if ENV set for this class, use it even if it points to a file does not exist
-          file_name = ENV[REDIS_CACHE_CONFIG_ENV_VAR_NAME]
-          return file_name unless file_name.nil?
-
-          # otherwise, if config files exists for this class, use it
-          file_name = config_file_path('redis.cache.yml')
-          return file_name if File.file?(file_name)
-
-          # this will force use of DEFAULT_REDIS_QUEUES_URL when config file is absent
-          super
-        end
-
-        def instrumentation_class
-          ::Gitlab::Instrumentation::Redis::Cache
+          'redis://localhost:6380'
         end
       end
     end

lib/gitlab/redis/queues.rb

 # frozen_string_literal: true
 
-# please require all dependencies below:
+# We need this require for MailRoom
 require_relative 'wrapper' unless defined?(::Gitlab::Redis::Wrapper)
 
 module Gitlab
@@ -8,29 +8,10 @@ module Gitlab
     class Queues < ::Gitlab::Redis::Wrapper
       SIDEKIQ_NAMESPACE = 'resque:gitlab'
       MAILROOM_NAMESPACE = 'mail_room:gitlab'
-      DEFAULT_REDIS_QUEUES_URL = 'redis://localhost:6381'
-      REDIS_QUEUES_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_QUEUES_CONFIG_FILE'
 
       class << self
         def default_url
-          DEFAULT_REDIS_QUEUES_URL
-        end
-
-        def config_file_name
-          # if ENV set for this class, use it even if it points to a file does not exist
-          file_name = ENV[REDIS_QUEUES_CONFIG_ENV_VAR_NAME]
-          return file_name if file_name
-
-          # otherwise, if config files exists for this class, use it
-          file_name = config_file_path('redis.queues.yml')
-          return file_name if File.file?(file_name)
-
-          # this will force use of DEFAULT_REDIS_QUEUES_URL when config file is absent
-          super
-        end
-
-        def instrumentation_class
-          ::Gitlab::Instrumentation::Redis::Queues
+          'redis://localhost:6381'
         end
       end
     end

lib/gitlab/redis/shared_state.rb

 # frozen_string_literal: true
 
-# please require all dependencies below:
-require_relative 'wrapper' unless defined?(::Gitlab::Redis::Wrapper)
-
 module Gitlab
   module Redis
     class SharedState < ::Gitlab::Redis::Wrapper
@@ -10,29 +7,10 @@ module Gitlab
       USER_SESSIONS_NAMESPACE = 'session:user:gitlab'
       USER_SESSIONS_LOOKUP_NAMESPACE = 'session:lookup:user:gitlab'
       IP_SESSIONS_LOOKUP_NAMESPACE = 'session:lookup:ip:gitlab2'
-      DEFAULT_REDIS_SHARED_STATE_URL = 'redis://localhost:6382'
-      REDIS_SHARED_STATE_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_SHARED_STATE_CONFIG_FILE'
 
       class << self
         def default_url
-          DEFAULT_REDIS_SHARED_STATE_URL
-        end
-
-        def config_file_name
-          # if ENV set for this class, use it even if it points to a file does not exist
-          file_name = ENV[REDIS_SHARED_STATE_CONFIG_ENV_VAR_NAME]
-          return file_name if file_name
-
-          # otherwise, if config files exists for this class, use it
-          file_name = config_file_path('redis.shared_state.yml')
-          return file_name if File.file?(file_name)
-
-          # this will force use of DEFAULT_REDIS_SHARED_STATE_URL when config file is absent
-          super
-        end
-
-        def instrumentation_class
-          ::Gitlab::Instrumentation::Redis::SharedState
+          'redis://localhost:6382'
         end
       end
     end

lib/gitlab/redis/wrapper.rb

 # frozen_string_literal: true
 
 # This file should only be used by sub-classes, not directly by any clients of the sub-classes
-# please require all dependencies below:
+
+# Explicitly load parts of ActiveSupport because MailRoom does not load
+# Rails.
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/string/inflections'
 
 module Gitlab
   module Redis
     class Wrapper
-      DEFAULT_REDIS_URL = 'redis://localhost:6379'
-      REDIS_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_CONFIG_FILE'
-
       class << self
         delegate :params, :url, to: :new
 
@@ -52,32 +52,35 @@ module Gitlab
         end
 
         def default_url
-          DEFAULT_REDIS_URL
+          raise NotImplementedError
         end
 
-        # Return the absolute path to a Rails configuration file
-        #
-        # We use this instead of `Rails.root` because for certain tasks
-        # utilizing these classes, `Rails` might not be available.
         def config_file_path(filename)
-          File.expand_path("../../../config/#{filename}", __dir__)
+          path = File.join(rails_root, 'config', filename)
+          return path if File.file?(path)
         end
 
-        def config_file_name
-          # if ENV set for wrapper class, use it even if it points to a file does not exist
-          file_name = ENV[REDIS_CONFIG_ENV_VAR_NAME]
-          return file_name unless file_name.nil?
+        # We need this local implementation of Rails.root because MailRoom
+        # doesn't load Rails.
+        def rails_root
+          File.expand_path('../../..', __dir__)
+        end
 
-          # otherwise, if config files exists for wrapper class, use it
-          file_name = config_file_path('resque.yml')
-          return file_name if File.file?(file_name)
+        def config_file_name
+          [
+            ENV["GITLAB_REDIS_#{store_name.underscore.upcase}_CONFIG_FILE"],
+            config_file_path("redis.#{store_name.underscore}.yml"),
+            ENV['GITLAB_REDIS_CONFIG_FILE'],
+            config_file_path('resque.yml')
+          ].compact.first
+        end
 
-          # nil will force use of DEFAULT_REDIS_URL when config file is absent
-          nil
+        def store_name
+          name.demodulize
         end
 
         def instrumentation_class
-          raise NotImplementedError
+          "::Gitlab::Instrumentation::Redis::#{store_name}".constantize
         end
       end
 

spec/config/mail_room_spec.rb

@@ -43,7 +43,7 @@ RSpec.describe 'mail_room.yml' do
 
   context 'when both incoming email and service desk email are enabled' do
     let(:gitlab_config_path) { 'spec/fixtures/config/mail_room_enabled.yml' }
-    let(:queues_config_path) { 'spec/fixtures/config/redis_queues_new_format_host.yml' }
+    let(:queues_config_path) { 'spec/fixtures/config/redis_new_format_host.yml' }
     let(:gitlab_redis_queues) { Gitlab::Redis::Queues.new(Rails.env) }
 
     it 'contains the intended configuration' do
@@ -72,7 +72,7 @@ RSpec.describe 'mail_room.yml' do
 
   context 'when both incoming email and service desk email are enabled for Microsoft Graph' do
     let(:gitlab_config_path) { 'spec/fixtures/config/mail_room_enabled_ms_graph.yml' }
-    let(:queues_config_path) { 'spec/fixtures/config/redis_queues_new_format_host.yml' }
+    let(:queues_config_path) { 'spec/fixtures/config/redis_new_format_host.yml' }
     let(:gitlab_redis_queues) { Gitlab::Redis::Queues.new(Rails.env) }
 
     it 'contains the intended configuration' do

spec/fixtures/config/redis_cache_config_with_env.yml

-test:
-  url: <%= ENV['TEST_GITLAB_REDIS_CACHE_URL'] %>

spec/fixtures/config/redis_cache_new_format_host.yml

-# redis://[:password@]host[:port][/db-number][?option=value]
-# more details: http://www.iana.org/assignments/uri-schemes/prov/redis
-development:
-  url: redis://:mynewpassword@localhost:6380/10
-  sentinels:
-    -
-      host: localhost
-      port: 26380 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26380 # point to sentinel, not to redis port
-test:
-  url: redis://:mynewpassword@localhost:6380/10
-  sentinels:
-    -
-      host: localhost
-      port: 26380 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26380 # point to sentinel, not to redis port
-production:
-  url: redis://:mynewpassword@localhost:6380/10
-  sentinels:
-    -
-      host: replica1
-      port: 26380 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26380 # point to sentinel, not to redis port

spec/fixtures/config/redis_cache_new_format_socket.yml

-development:
-  url: unix:/path/to/redis.cache.sock
-test:
-  url: unix:/path/to/redis.cache.sock
-production:
-  url: unix:/path/to/redis.cache.sock

spec/fixtures/config/redis_cache_old_format_host.yml

-# redis://[:password@]host[:port][/db-number][?option=value]
-# more details: http://www.iana.org/assignments/uri-schemes/prov/redis
-development: redis://:mypassword@localhost:6380/10
-test: redis://:mypassword@localhost:6380/10
-production: redis://:mypassword@localhost:6380/10

spec/fixtures/config/redis_cache_old_format_socket.yml

-development: unix:/path/to/old/redis.cache.sock
-test: unix:/path/to/old/redis.cache.sock
-production: unix:/path/to/old/redis.cache.sock

spec/fixtures/config/redis_new_format_host.yml

 # redis://[:password@]host[:port][/db-number][?option=value]
 # more details: http://www.iana.org/assignments/uri-schemes/prov/redis
 development:
-  url: redis://:mynewpassword@localhost:6379/99
+  url: redis://:mynewpassword@development-host:6379/99
   sentinels:
     -
-      host: localhost
+      host: development-replica1
       port: 26379 # point to sentinel, not to redis port
     -
-      host: replica2
+      host: development-replica2
       port: 26379 # point to sentinel, not to redis port
 test:
-  url: redis://:mynewpassword@localhost:6379/99
+  url: redis://:mynewpassword@test-host:6379/99
   sentinels:
     -
-      host: localhost
+      host: test-replica1
       port: 26379 # point to sentinel, not to redis port
     -
-      host: replica2
+      host: test-replica2
       port: 26379 # point to sentinel, not to redis port
 production:
-  url: redis://:mynewpassword@localhost:6379/99
+  url: redis://:mynewpassword@production-host:6379/99
   sentinels:
     -
-      host: replica1
+      host: production-replica1
       port: 26379 # point to sentinel, not to redis port
     -
-      host: replica2
+      host: production-replica2
       port: 26379 # point to sentinel, not to redis port

spec/fixtures/config/redis_queues_config_with_env.yml

-test:
-  url: <%= ENV['TEST_GITLAB_REDIS_QUEUES_URL'] %>

spec/fixtures/config/redis_queues_new_format_host.yml

-# redis://[:password@]host[:port][/db-number][?option=value]
-# more details: http://www.iana.org/assignments/uri-schemes/prov/redis
-development:
-  url: redis://:mynewpassword@localhost:6381/11
-  sentinels:
-    -
-      host: localhost
-      port: 26381 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26381 # point to sentinel, not to redis port
-test:
-  url: redis://:mynewpassword@localhost:6381/11
-  sentinels:
-    -
-      host: localhost
-      port: 26381 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26381 # point to sentinel, not to redis port
-production:
-  url: redis://:mynewpassword@localhost:6381/11
-  sentinels:
-    -
-      host: replica1
-      port: 26381 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26381 # point to sentinel, not to redis port

spec/fixtures/config/redis_queues_new_format_socket.yml

-development:
-  url: unix:/path/to/redis.queues.sock
-test:
-  url: unix:/path/to/redis.queues.sock
-production:
-  url: unix:/path/to/redis.queues.sock

spec/fixtures/config/redis_queues_old_format_host.yml

-# redis://[:password@]host[:port][/db-number][?option=value]
-# more details: http://www.iana.org/assignments/uri-schemes/prov/redis
-development: redis://:mypassword@localhost:6381/11
-test: redis://:mypassword@localhost:6381/11
-production: redis://:mypassword@localhost:6381/11

spec/fixtures/config/redis_queues_old_format_socket.yml

-development: unix:/path/to/old/redis.queues.sock
-test: unix:/path/to/old/redis.queues.sock
-production: unix:/path/to/old/redis.queues.sock

spec/fixtures/config/redis_shared_state_config_with_env.yml

-test:
-  url: <%= ENV['TEST_GITLAB_REDIS_SHARED_STATE_URL'] %>

spec/fixtures/config/redis_shared_state_new_format_host.yml

-# redis://[:password@]host[:port][/db-number][?option=value]
-# more details: http://www.iana.org/assignments/uri-schemes/prov/redis
-development:
-  url: redis://:mynewpassword@localhost:6382/12
-  sentinels:
-    -
-      host: localhost
-      port: 26382 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26382 # point to sentinel, not to redis port
-test:
-  url: redis://:mynewpassword@localhost:6382/12
-  sentinels:
-    -
-      host: localhost
-      port: 26382 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26382 # point to sentinel, not to redis port
-production:
-  url: redis://:mynewpassword@localhost:6382/12
-  sentinels:
-    -
-      host: replica1
-      port: 26382 # point to sentinel, not to redis port
-    -
-      host: replica2
-      port: 26382 # point to sentinel, not to redis port

spec/fixtures/config/redis_shared_state_new_format_socket.yml

-development:
-  url: unix:/path/to/redis.shared_state.sock
-test:
-  url: unix:/path/to/redis.shared_state.sock
-production:
-  url: unix:/path/to/redis.shared_state.sock

spec/fixtures/config/redis_shared_state_old_format_host.yml

-# redis://[:password@]host[:port][/db-number][?option=value]
-# more details: http://www.iana.org/assignments/uri-schemes/prov/redis
-development: redis://:mypassword@localhost:6382/12
-test: redis://:mypassword@localhost:6382/12
-production: redis://:mypassword@localhost:6382/12

spec/fixtures/config/redis_shared_state_old_format_socket.yml

-development: unix:/path/to/old/redis.shared_state.sock
-test: unix:/path/to/old/redis.shared_state.sock
-production: unix:/path/to/old/redis.shared_state.sock

spec/lib/gitlab/redis/cache_spec.rb

@@ -3,20 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Redis::Cache do
-  let(:config_file_name) { "config/redis.cache.yml" }
+  let(:instance_specific_config_file) { "config/redis.cache.yml" }
   let(:environment_config_file_name) { "GITLAB_REDIS_CACHE_CONFIG_FILE" }
-  let(:config_old_format_socket) { "spec/fixtures/config/redis_cache_old_format_socket.yml" }
-  let(:config_new_format_socket) { "spec/fixtures/config/redis_cache_new_format_socket.yml" }
-  let(:old_socket_path) {"/path/to/old/redis.cache.sock" }
-  let(:new_socket_path) {"/path/to/redis.cache.sock" }
-  let(:config_old_format_host) { "spec/fixtures/config/redis_cache_old_format_host.yml" }
-  let(:config_new_format_host) { "spec/fixtures/config/redis_cache_new_format_host.yml" }
-  let(:redis_port) { 6380 }
-  let(:redis_database) { 10 }
-  let(:sentinel_port) { redis_port + 20000 }
-  let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_cache_config_with_env.yml"}
-  let(:config_env_variable_url) {"TEST_GITLAB_REDIS_CACHE_URL"}
-  let(:class_redis_url) { Gitlab::Redis::Cache::DEFAULT_REDIS_CACHE_URL }
+  let(:class_redis_url) { 'redis://localhost:6380' }
 
   include_examples "redis_shared_examples"
 end

spec/lib/gitlab/redis/queues_spec.rb

@@ -3,20 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Redis::Queues do
-  let(:config_file_name) { "config/redis.queues.yml" }
+  let(:instance_specific_config_file) { "config/redis.queues.yml" }
   let(:environment_config_file_name) { "GITLAB_REDIS_QUEUES_CONFIG_FILE" }
-  let(:config_old_format_socket) { "spec/fixtures/config/redis_queues_old_format_socket.yml" }
-  let(:config_new_format_socket) { "spec/fixtures/config/redis_queues_new_format_socket.yml" }
-  let(:old_socket_path) {"/path/to/old/redis.queues.sock" }
-  let(:new_socket_path) {"/path/to/redis.queues.sock" }
-  let(:config_old_format_host) { "spec/fixtures/config/redis_queues_old_format_host.yml" }
-  let(:config_new_format_host) { "spec/fixtures/config/redis_queues_new_format_host.yml" }
-  let(:redis_port) { 6381 }
-  let(:redis_database) { 11 }
-  let(:sentinel_port) { redis_port + 20000 }
-  let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_queues_config_with_env.yml"}
-  let(:config_env_variable_url) {"TEST_GITLAB_REDIS_QUEUES_URL"}
-  let(:class_redis_url) { Gitlab::Redis::Queues::DEFAULT_REDIS_QUEUES_URL }
+  let(:class_redis_url) { 'redis://localhost:6381' }
 
   include_examples "redis_shared_examples"
 end

spec/lib/gitlab/redis/shared_state_spec.rb

@@ -3,20 +3,9 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Redis::SharedState do
-  let(:config_file_name) { "config/redis.shared_state.yml" }
+  let(:instance_specific_config_file) { "config/redis.shared_state.yml" }
   let(:environment_config_file_name) { "GITLAB_REDIS_SHARED_STATE_CONFIG_FILE" }
-  let(:config_old_format_socket) { "spec/fixtures/config/redis_shared_state_old_format_socket.yml" }
-  let(:config_new_format_socket) { "spec/fixtures/config/redis_shared_state_new_format_socket.yml" }
-  let(:old_socket_path) {"/path/to/old/redis.shared_state.sock" }
-  let(:new_socket_path) {"/path/to/redis.shared_state.sock" }
-  let(:config_old_format_host) { "spec/fixtures/config/redis_shared_state_old_format_host.yml" }
-  let(:config_new_format_host) { "spec/fixtures/config/redis_shared_state_new_format_host.yml" }
-  let(:redis_port) { 6382 }
-  let(:redis_database) { 12 }
-  let(:sentinel_port) { redis_port + 20000 }
-  let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_shared_state_config_with_env.yml"}
-  let(:config_env_variable_url) {"TEST_GITLAB_REDIS_SHARED_STATE_URL"}
-  let(:class_redis_url) { Gitlab::Redis::SharedState::DEFAULT_REDIS_SHARED_STATE_URL }
+  let(:class_redis_url) { 'redis://localhost:6382' }
 
   include_examples "redis_shared_examples"
 end

spec/lib/gitlab/redis/wrapper_spec.rb

@@ -3,47 +3,15 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::Redis::Wrapper do
-  let(:config_file_name) { "config/resque.yml" }
-  let(:environment_config_file_name) { "GITLAB_REDIS_CONFIG_FILE" }
-  let(:config_old_format_socket) { "spec/fixtures/config/redis_old_format_socket.yml" }
-  let(:config_new_format_socket) { "spec/fixtures/config/redis_new_format_socket.yml" }
-  let(:old_socket_path) {"/path/to/old/redis.sock" }
-  let(:new_socket_path) {"/path/to/redis.sock" }
-  let(:config_old_format_host) { "spec/fixtures/config/redis_old_format_host.yml" }
-  let(:config_new_format_host) { "spec/fixtures/config/redis_new_format_host.yml" }
-  let(:redis_port) { 6379 }
-  let(:redis_database) { 99 }
-  let(:sentinel_port) { redis_port + 20000 }
-  let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_config_with_env.yml"}
-  let(:config_env_variable_url) {"TEST_GITLAB_REDIS_URL"}
-  let(:class_redis_url) { Gitlab::Redis::Wrapper::DEFAULT_REDIS_URL }
-
-  include_examples "redis_shared_examples" do
-    before do
-      allow(described_class).to receive(:instrumentation_class) do
-        ::Gitlab::Instrumentation::Redis::Cache
-      end
-    end
-  end
-
-  describe '.version' do
-    it 'returns a version' do
-      expect(described_class.version).to be_present
-    end
-  end
-
   describe '.instrumentation_class' do
-    it 'raises a NotImplementedError' do
-      expect(described_class).to receive(:instrumentation_class).and_call_original
-
-      expect { described_class.instrumentation_class }.to raise_error(NotImplementedError)
+    it 'raises a NameError' do
+      expect { described_class.instrumentation_class }.to raise_error(NameError)
     end
   end
 
-  describe '.config_file_path' do
-    it 'returns the absolute path to the configuration file' do
-      expect(described_class.config_file_path('foo.yml'))
-        .to eq Rails.root.join('config', 'foo.yml').to_s
+  describe '.default_url' do
+    it 'is not implemented' do
+      expect { described_class.default_url }.to raise_error(NotImplementedError)
     end
   end
 end

spec/services/user_project_access_changed_service_spec.rb

@@ -31,4 +31,37 @@ RSpec.describe UserProjectAccessChangedService do
                                           priority: described_class::LOW_PRIORITY)
     end
   end
+
+  context 'with load balancing enabled' do
+    let(:service) { UserProjectAccessChangedService.new([1, 2]) }
+
+    before do
+      allow(Gitlab::Database::LoadBalancing).to receive(:enable?).and_return(true)
+
+      expect(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
+                                            .with([[1], [2]])
+                                            .and_return(10)
+    end
+
+    it 'sticks all the updated users and returns the original result', :aggregate_failures do
+      expect(Gitlab::Database::LoadBalancing::Sticking).to receive(:bulk_stick).with(:user, [1, 2])
+
+      expect(service.execute).to eq(10)
+    end
+
+    it 'avoids N+1 cached queries', :use_sql_query_cache, :request_store do
+      # Run this once to establish a baseline
+      control_count = ActiveRecord::QueryRecorder.new(skip_cached: false) do
+        service.execute
+      end
+
+      service = UserProjectAccessChangedService.new([1, 2, 3, 4, 5])
+
+      allow(AuthorizedProjectsWorker).to receive(:bulk_perform_and_wait)
+                                            .with([[1], [2], [3], [4], [5]])
+                                            .and_return(10)
+
+      expect { service.execute }.not_to exceed_all_query_limit(control_count.count)
+    end
+  end
 end

spec/support/redis/redis_shared_examples.rb

@@ -4,9 +4,21 @@ RSpec.shared_examples "redis_shared_examples" do
   include StubENV
 
   let(:test_redis_url) { "redis://redishost:#{redis_port}"}
+  let(:config_file_name) { instance_specific_config_file }
+  let(:config_old_format_socket) { "spec/fixtures/config/redis_old_format_socket.yml" }
+  let(:config_new_format_socket) { "spec/fixtures/config/redis_new_format_socket.yml" }
+  let(:old_socket_path) {"/path/to/old/redis.sock" }
+  let(:new_socket_path) {"/path/to/redis.sock" }
+  let(:config_old_format_host) { "spec/fixtures/config/redis_old_format_host.yml" }
+  let(:config_new_format_host) { "spec/fixtures/config/redis_new_format_host.yml" }
+  let(:redis_port) { 6379 }
+  let(:redis_database) { 99 }
+  let(:sentinel_port) { 26379 }
+  let(:config_with_environment_variable_inside) { "spec/fixtures/config/redis_config_with_env.yml"}
+  let(:config_env_variable_url) {"TEST_GITLAB_REDIS_URL"}
 
   before do
-    stub_env(environment_config_file_name, Rails.root.join(config_file_name))
+    allow(described_class).to receive(:config_file_name).and_return(Rails.root.join(config_file_name).to_s)
     clear_raw_config
   end
 
@@ -14,8 +26,72 @@ RSpec.shared_examples "redis_shared_examples" do
     clear_raw_config
   end
 
+  describe '.config_file_name' do
+    subject { described_class.config_file_name }
+
+    let(:rails_root) { Dir.mktmpdir('redis_shared_examples') }
+
+    before do
+      # Undo top-level stub of config_file_name because we are testing that method now.
+      allow(described_class).to receive(:config_file_name).and_call_original
+
+      allow(described_class).to receive(:rails_root).and_return(rails_root)
+      FileUtils.mkdir_p(File.join(rails_root, 'config'))
+    end
+
+    after do
+      FileUtils.rm_rf(rails_root)
+    end
+
+    context 'when there is no config file anywhere' do
+      it { expect(subject).to be_nil }
+
+      context 'but resque.yml exists' do
+        before do
+          FileUtils.touch(File.join(rails_root, 'config', 'resque.yml'))
+        end
+
+        it { expect(subject).to eq("#{rails_root}/config/resque.yml") }
+
+        it 'returns a path that exists' do
+          expect(File.file?(subject)).to eq(true)
+        end
+
+        context 'and there is a global env override' do
+          before do
+            stub_env('GITLAB_REDIS_CONFIG_FILE', 'global override')
+          end
+
+          it { expect(subject).to eq('global override') }
+
+          context 'and there is an instance specific config file' do
+            before do
+              FileUtils.touch(File.join(rails_root, instance_specific_config_file))
+            end
+
+            it { expect(subject).to eq("#{rails_root}/#{instance_specific_config_file}") }
+
+            it 'returns a path that exists' do
+              expect(File.file?(subject)).to eq(true)
+            end
+
+            context 'and there is a specific env override' do
+              before do
+                stub_env(environment_config_file_name, 'instance specific override')
+              end
+
+              it { expect(subject).to eq('instance specific override') }
+            end
+          end
+        end
+      end
+    end
+  end
+
   describe '.params' do
-    subject { described_class.params }
+    subject { described_class.new(rails_env).params }
+
+    let(:rails_env) { 'development' }
 
     it 'withstands mutation' do
       params1 = described_class.params
@@ -58,13 +134,23 @@ RSpec.shared_examples "redis_shared_examples" do
       context 'with new format' do
         let(:config_file_name) { config_new_format_host }
 
+        where(:rails_env, :host) do
+          [
+            %w[development development-host],
+            %w[test test-host],
+            %w[production production-host]
+          ]
+        end
+
+        with_them do
           it 'returns hash with host, port, db, and password' do
-          is_expected.to include(host: 'localhost', password: 'mynewpassword', port: redis_port, db: redis_database)
+            is_expected.to include(host: host, password: 'mynewpassword', port: redis_port, db: redis_database)
             is_expected.not_to have_key(:url)
           end
         end
       end
     end
+  end
 
   describe '.url' do
     it 'withstands mutation' do
@@ -88,6 +174,12 @@ RSpec.shared_examples "redis_shared_examples" do
     end
   end
 
+  describe '.version' do
+    it 'returns a version' do
+      expect(described_class.version).to be_present
+    end
+  end
+
   describe '._raw_config' do
     subject { described_class._raw_config }
 
@@ -143,14 +235,26 @@ RSpec.shared_examples "redis_shared_examples" do
   end
 
   describe '#sentinels' do
-    subject { described_class.new(Rails.env).sentinels }
+    subject { described_class.new(rails_env).sentinels }
+
+    let(:rails_env) { 'development' }
 
     context 'when sentinels are defined' do
       let(:config_file_name) { config_new_format_host }
 
+      where(:rails_env, :hosts) do
+        [
+          ['development', %w[development-replica1 development-replica2]],
+          ['test', %w[test-replica1 test-replica2]],
+          ['production', %w[production-replica1 production-replica2]]
+        ]
+      end
+
+      with_them do
         it 'returns an array of hashes with host and port keys' do
-        is_expected.to include(host: 'localhost', port: sentinel_port)
-        is_expected.to include(host: 'replica2', port: sentinel_port)
+          is_expected.to include(host: hosts[0], port: sentinel_port)
+          is_expected.to include(host: hosts[1], port: sentinel_port)
+        end
       end
     end