Merge branch '213777-fix-stale-cache-bug' into 'master'

Fix ES rollout stale cache bug

See merge request gitlab-org/gitlab!29233

ee/app/models/elasticsearch_indexed_namespace.rb

@@ -27,6 +27,7 @@ class ElasticsearchIndexedNamespace < ApplicationRecord
   end
 
   def self.drop_limited_ids_cache!
+    # To prevent stale cache we also drop ElasticsearchIndexedProject cache since it uses ElasticsearchIndexedNamespace
     ElasticsearchIndexedProject.drop_limited_ids_cache!
     super
   end
@@ -56,6 +57,8 @@ class ElasticsearchIndexedNamespace < ApplicationRecord
 
       ElasticNamespaceIndexerWorker.bulk_perform_async(jobs) # rubocop:disable Scalability/BulkPerformWithContext, CodeReuse/Worker
     end
+
+    drop_limited_ids_cache!
   end
 
   def self.unindex_last_n_namespaces_of_plan(plan, number_of_namespaces)
@@ -73,6 +76,8 @@ class ElasticsearchIndexedNamespace < ApplicationRecord
 
       ElasticNamespaceIndexerWorker.bulk_perform_async(jobs) # rubocop:disable Scalability/BulkPerformWithContext, CodeReuse/Worker
     end
+
+    drop_limited_ids_cache!
   end
 
   private

ee/changelogs/unreleased/213777-fix-stale-cache-bug.yml

+---
+title: Fix Elasticsearch rollout stale cache bug
+merge_request: 29233
+author:
+type: fixed

ee/spec/models/elasticsearch_indexed_namespace_spec.rb

@@ -39,7 +39,7 @@ describe ElasticsearchIndexedNamespace do
     end
   end
 
-  context 'with plans' do
+  context 'with plans', :use_clean_rails_redis_caching do
     Plan::PAID_HOSTED_PLANS.each do |plan|
       plan_factory = "#{plan}_plan"
       let_it_be(plan_factory) { create(plan_factory) }
@@ -54,8 +54,11 @@ describe ElasticsearchIndexedNamespace do
       stub_ee_application_setting(elasticsearch_indexing: false)
     end
 
-    def get_indexed_namespaces
-      described_class.order(:created_at).pluck(:namespace_id)
+    def expect_indexed_namespaces_to_match(array)
+      ids = described_class.order(:created_at).pluck(:namespace_id)
+
+      expect(ids).to eq(array)
+      expect(ids).to match_array(described_class.limited_ids_cached)
     end
 
     def expect_queue_to_contain(*args)
@@ -66,21 +69,23 @@ describe ElasticsearchIndexedNamespace do
 
     describe '.index_first_n_namespaces_of_plan' do
       it 'creates records, scoped by plan and ordered by namespace id' do
+        expect(ElasticsearchIndexedNamespace).to receive(:drop_limited_ids_cache!).and_call_original.exactly(3).times
+
         ids = namespaces.map(&:id)
 
         described_class.index_first_n_namespaces_of_plan('gold', 1)
 
-        expect(get_indexed_namespaces).to eq([ids[0]])
+        expect_indexed_namespaces_to_match([ids[0]])
         expect_queue_to_contain(ids[0], "index")
 
         described_class.index_first_n_namespaces_of_plan('gold', 2)
 
-        expect(get_indexed_namespaces).to eq([ids[0], ids[2]])
+        expect_indexed_namespaces_to_match([ids[0], ids[2]])
         expect_queue_to_contain(ids[2], "index")
 
         described_class.index_first_n_namespaces_of_plan('silver', 1)
 
-        expect(get_indexed_namespaces).to eq([ids[0], ids[2], ids[1]])
+        expect_indexed_namespaces_to_match([ids[0], ids[2], ids[1]])
         expect_queue_to_contain(ids[1], "index")
       end
     end
@@ -92,23 +97,26 @@ describe ElasticsearchIndexedNamespace do
       end
 
       it 'creates records, scoped by plan and ordered by namespace id' do
+        expect(ElasticsearchIndexedNamespace).to receive(:drop_limited_ids_cache!).and_call_original.exactly(3).times
+
         ids = namespaces.map(&:id)
 
-        expect(get_indexed_namespaces).to contain_exactly(ids[0], ids[2], ids[1])
+        expect_indexed_namespaces_to_match([ids[0], ids[2], ids[1]])
 
         described_class.unindex_last_n_namespaces_of_plan('gold', 1)
 
-        expect(get_indexed_namespaces).to contain_exactly(ids[0], ids[1])
+        expect_indexed_namespaces_to_match([ids[0], ids[1]])
         expect_queue_to_contain(ids[2], "delete")
 
         described_class.unindex_last_n_namespaces_of_plan('silver', 1)
 
-        expect(get_indexed_namespaces).to contain_exactly(ids[0])
+        expect_indexed_namespaces_to_match([ids[0]])
+
         expect_queue_to_contain(ids[1], "delete")
 
         described_class.unindex_last_n_namespaces_of_plan('gold', 1)
 
-        expect(get_indexed_namespaces).to be_empty
+        expect_indexed_namespaces_to_match([])
         expect_queue_to_contain(ids[0], "delete")
       end
     end