Merge branch '4070-geo-caching-issue-count' into 'master'

Resolve "Geo: cache results in issue and message count being incorrect"

Closes #4070

See merge request gitlab-org/gitlab-ee!3639

app/services/base_count_service.rb

 # Base class for services that count a single resource such as the number of
 # issues for a project.
 class BaseCountService
+  prepend ::EE::BaseCountService
+
   def relation_for_count
     raise(
       NotImplementedError,

changelogs/unreleased-ee/4070-geo-caching-issue-count.yml

+---
+title: Issue count now refreshes quicker on geo secondary
+merge_request: 3639
+author:
+type: fixed

ee/app/services/ee/base_count_service.rb

+module EE
+  module BaseCountService
+    # geo secondary cache should expire quicker than primary, otherwise various counts
+    # could be incorrect for 2 weeks.
+    def cache_options
+      raise NotImplementedError.new unless defined?(super)
+
+      value = super
+      value[:expires_in] = 20.minutes if ::Gitlab::Geo.secondary?
+      value
+    end
+  end
+end

spec/ee/spec/services/base_count_service_spec.rb

+require 'spec_helper'
+
+describe BaseCountService do
+  include ::EE::GeoHelpers
+
+  describe '#cache_options' do
+    subject { described_class.new.cache_options }
+
+    it 'returns the default' do
+      stub_current_geo_node(nil)
+
+      is_expected.to include(:raw)
+      is_expected.not_to include(:expires_in)
+    end
+
+    it 'returns default on a Geo primary' do
+      stub_current_geo_node(create(:geo_node, :primary))
+
+      is_expected.to include(:raw)
+      is_expected.not_to include(:expires_in)
+    end
+
+    it 'returns cache of 20 mins on a Geo secondary' do
+      stub_current_geo_node(create(:geo_node))
+
+      is_expected.to include(:raw)
+      is_expected.to include(expires_in: 20.minutes)
+    end
+  end
+end

spec/services/users/keys_count_service_spec.rb

@@ -15,14 +15,12 @@ describe Users::KeysCountService, :use_clean_rails_memory_store_caching do
       expect(service.count).to eq(1)
     end
 
-    it 'caches the number of keys in Redis' do
+    it 'caches the number of keys in Redis', :request_store do
+      service.delete_cache
+      control_count = ActiveRecord::QueryRecorder.new { service.count }.count
       service.delete_cache
 
-      recorder = ActiveRecord::QueryRecorder.new do
-        2.times { service.count }
-      end
-
-      expect(recorder.count).to eq(1)
+      expect { 2.times { service.count } }.not_to exceed_query_limit(control_count)
     end
   end