Add latest changes from gitlab-org/gitlab@master

2 files changed, 61 insertions, 2 deletions

diff --git a/spec/lib/gitlab/redis/multi_store_spec.rb b/spec/lib/gitlab/redis/multi_store_spec.rb
index bf1bf65bb9b..1bb622663e8 100644
--- a/spec/lib/gitlab/redis/multi_store_spec.rb
+++ b/spec/lib/gitlab/redis/multi_store_spec.rb
@@ -114,6 +114,12 @@ RSpec.describe Gitlab::Redis::MultiStore do
     end
 
     RSpec.shared_examples_for 'fallback read from the secondary store' do
+      let(:counter) { Gitlab::Metrics::NullMetric.instance }
+
+      before do
+        allow(Gitlab::Metrics).to receive(:counter).and_return(counter)
+      end
+
       it 'fallback and execute on secondary instance' do
         expect(secondary_store).to receive(name).with(*args).and_call_original
 
@@ -128,7 +134,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
       end
 
       it 'increment read fallback count metrics' do
-        expect(multi_store).to receive(:increment_read_fallback_count).with(name)
+        expect(counter).to receive(:increment).with(command: name, instance_name: instance_name)
 
         subject
       end
@@ -401,9 +407,12 @@ RSpec.describe Gitlab::Redis::MultiStore do
   end
 
   context 'with unsupported command' do
+    let(:counter) { Gitlab::Metrics::NullMetric.instance }
+
     before do
       primary_store.flushdb
       secondary_store.flushdb
+      allow(Gitlab::Metrics).to receive(:counter).and_return(counter)
     end
 
     let_it_be(:key) { "redis:counter" }
@@ -426,7 +435,7 @@ RSpec.describe Gitlab::Redis::MultiStore do
     end
 
     it 'increments method missing counter' do
-      expect(multi_store).to receive(:increment_method_missing_count).with(:incr)
+      expect(counter).to receive(:increment).with(command: :incr, instance_name: instance_name)
 
       subject
     end
diff --git a/spec/lib/gitlab/redis/sessions_spec.rb b/spec/lib/gitlab/redis/sessions_spec.rb
index 7e239c08e9f..c62d10eb566 100644
--- a/spec/lib/gitlab/redis/sessions_spec.rb
+++ b/spec/lib/gitlab/redis/sessions_spec.rb
@@ -4,4 +4,54 @@ require 'spec_helper'
 
 RSpec.describe Gitlab::Redis::Sessions do
   include_examples "redis_new_instance_shared_examples", 'sessions', Gitlab::Redis::SharedState
+
+  describe 'redis instance used in connection pool' do
+    before do
+      clear_pool
+    end
+
+    context 'when redis.sessions configuration is not provided' do
+      it 'uses ::Redis instance' do
+        expect(described_class).to receive(:config_fallback?).and_return(true)
+
+        described_class.pool.with do |redis_instance|
+          expect(redis_instance).to be_instance_of(::Redis)
+        end
+      end
+    end
+
+    context 'when redis.sessions configuration is provided' do
+      it 'instantiates an instance of MultiStore' do
+        expect(described_class).to receive(:config_fallback?).and_return(false)
+
+        described_class.pool.with do |redis_instance|
+          expect(redis_instance).to be_instance_of(::Gitlab::Redis::MultiStore)
+        end
+      end
+    end
+
+    def clear_pool
+      described_class.remove_instance_variable(:@pool)
+    rescue NameError
+      # raised if @pool was not set; ignore
+    end
+  end
+
+  describe '#store' do
+    subject { described_class.store(namespace: described_class::SESSION_NAMESPACE) }
+
+    context 'when redis.sessions configuration is provided' do
+      it 'instantiates ::Redis instance' do
+        expect(described_class).to receive(:config_fallback?).and_return(true)
+        expect(subject).to be_instance_of(::Redis::Store)
+      end
+    end
+
+    context 'when redis.sessions configuration is not provided' do
+      it 'instantiates an instance of MultiStore' do
+        expect(described_class).to receive(:config_fallback?).and_return(false)
+        expect(subject).to be_instance_of(::Gitlab::Redis::MultiStore)
+      end
+    end
+  end
 end