Merge branch '244865-fix-big-sorted-sets' into 'master'

Big sorted sets in redis for Elastic bookkeeping

See merge request gitlab-org/gitlab!55047

ee/app/services/elastic/bookkeeping_shard_service.rb

+# frozen_string_literal: true
+
+module Elastic
+  class BookkeepingShardService
+    def self.shard_number(number_of_shards:, data:)
+      Digest::SHA256.hexdigest(data).hex % number_of_shards
+    end
+  end
+end

ee/app/services/elastic/process_bookkeeping_service.rb

@@ -2,11 +2,23 @@
 
 module Elastic
   class ProcessBookkeepingService
-    REDIS_SET_KEY = 'elastic:incremental:updates:0:zset'
-    REDIS_SCORE_KEY = 'elastic:incremental:updates:0:score'
-    LIMIT = 10_000
+    SHARD_LIMIT = 1_000
+    SHARDS_NUMBER = 16
+    SHARDS = 0.upto(SHARDS_NUMBER - 1).to_a
 
     class << self
+      def shard_number(data)
+        Elastic::BookkeepingShardService.shard_number(number_of_shards: SHARDS_NUMBER, data: data)
+      end
+
+      def redis_set_key(shard_number)
+        "elastic:incremental:updates:#{shard_number}:zset"
+      end
+
+      def redis_score_key(shard_number)
+        "elastic:incremental:updates:#{shard_number}:score"
+      end
+
       # Add some records to the processing queue. Items must be serializable to
       # a Gitlab::Elastic::DocumentReference
       def track!(*items)
@@ -14,19 +26,25 @@ module Elastic
 
         items.map! { |item| ::Gitlab::Elastic::DocumentReference.serialize(item) }
 
+        items_by_shard = items.group_by { |item| shard_number(item) }
+
         with_redis do |redis|
-          # Efficiently generate a guaranteed-unique score for each item
-          max = redis.incrby(self::REDIS_SCORE_KEY, items.size)
-          min = (max - items.size) + 1
-
-          (min..max).zip(items).each_slice(1000) do |group|
-            logger.debug(class: self.name,
-                         redis_set: self::REDIS_SET_KEY,
-                         message: 'track_items',
-                         count: group.count,
-                         tracked_items_encoded: group.to_json)
-
-            redis.zadd(self::REDIS_SET_KEY, group)
+          items_by_shard.each do |shard_number, shard_items|
+            set_key = redis_set_key(shard_number)
+
+            # Efficiently generate a guaranteed-unique score for each item
+            max = redis.incrby(redis_score_key(shard_number), shard_items.size)
+            min = (max - shard_items.size) + 1
+
+            (min..max).zip(shard_items).each_slice(1000) do |group|
+              logger.debug(class: self.name,
+                          redis_set: set_key,
+                          message: 'track_items',
+                          count: group.count,
+                          tracked_items_encoded: group.to_json)
+
+              redis.zadd(set_key, group)
+            end
           end
         end
 
@@ -34,17 +52,42 @@ module Elastic
       end
 
       def queue_size
-        with_redis { |redis| redis.zcard(self::REDIS_SET_KEY) }
+        with_redis do |redis|
+          SHARDS.sum do |shard_number|
+            redis.zcard(redis_set_key(shard_number))
+          end
+        end
+      end
+
+      def queued_items
+        {}.tap do |hash|
+          with_redis do |redis|
+            each_queued_items_by_shard(redis) do |shard_number, specs|
+              hash[shard_number] = specs if specs.present?
+            end
+          end
+        end
       end
 
       def clear_tracking!
         with_redis do |redis|
           Gitlab::Instrumentation::RedisClusterValidator.allow_cross_slot_commands do
-            redis.unlink(self::REDIS_SET_KEY, self::REDIS_SCORE_KEY)
+            keys = SHARDS.map { |m| [redis_set_key(m), redis_score_key(m)] }.flatten
+
+            redis.unlink(*keys)
           end
         end
       end
 
+      def each_queued_items_by_shard(redis)
+        SHARDS.each do |shard_number|
+          set_key = redis_set_key(shard_number)
+          specs = redis.zrangebyscore(set_key, '-inf', '+inf', limit: [0, SHARD_LIMIT], with_scores: true)
+
+          yield shard_number, specs
+        end
+      end
+
       def logger
         # build already caches the logger via request store
         ::Gitlab::Elasticsearch::Logger.build
@@ -88,41 +131,55 @@ module Elastic
     def execute_with_redis(redis)
       start_time = Time.current
 
-      specs = redis.zrangebyscore(self.class::REDIS_SET_KEY, '-inf', '+inf', limit: [0, LIMIT], with_scores: true)
-      return 0 if specs.empty?
+      specs_buffer = []
+      scores = {}
 
-      first_score = specs.first.last
-      last_score = specs.last.last
+      self.class.each_queued_items_by_shard(redis) do |shard_number, specs|
+        next if specs.empty?
 
-      logger.info(
-        message: 'bulk_indexing_start',
-        records_count: specs.count,
-        first_score: first_score,
-        last_score: last_score
-      )
+        set_key = self.class.redis_set_key(shard_number)
+        first_score = specs.first.last
+        last_score = specs.last.last
 
-      refs = deserialize_all(specs)
+        logger.info(
+          message: 'bulk_indexing_start',
+          redis_set: set_key,
+          records_count: specs.count,
+          first_score: first_score,
+          last_score: last_score
+        )
+
+        specs_buffer += specs
+
+        scores[set_key] = [first_score, last_score, specs.count]
+      end
+
+      return 0 if specs_buffer.blank?
+
+      refs = deserialize_all(specs_buffer)
       refs.preload_database_records.each { |ref| submit_document(ref) }
+
       failures = bulk_indexer.flush
 
       # Re-enqueue any failures so they are retried
       self.class.track!(*failures) if failures.present?
 
       # Remove all the successes
-      redis.zremrangebyscore(self.class::REDIS_SET_KEY, first_score, last_score)
-
-      records_count = specs.count
-
-      logger.info(
-        message: 'bulk_indexing_end',
-        records_count: records_count,
-        failures_count: failures.count,
-        first_score: first_score,
-        last_score: last_score,
-        bulk_execution_duration_s: Time.current - start_time
-      )
+      scores.each do |set_key, (first_score, last_score, count)|
+        redis.zremrangebyscore(set_key, first_score, last_score)
+
+        logger.info(
+          message: 'bulk_indexing_end',
+          redis_set: set_key,
+          records_count: count,
+          first_score: first_score,
+          last_score: last_score,
+          failures_count: failures.count,
+          bulk_execution_duration_s: Time.current - start_time
+        )
+      end
 
-      records_count
+      specs_buffer.count
     end
 
     def deserialize_all(specs)

ee/app/services/elastic/process_initial_bookkeeping_service.rb

@@ -2,8 +2,6 @@
 
 module Elastic
   class ProcessInitialBookkeepingService < Elastic::ProcessBookkeepingService
-    REDIS_SET_KEY = 'elastic:bulk:initial:0:zset'
-    REDIS_SCORE_KEY = 'elastic:bulk:initial:0:score'
     INDEXED_PROJECT_ASSOCIATIONS = [
       :issues,
       :merge_requests,
@@ -13,6 +11,14 @@ module Elastic
     ].freeze
 
     class << self
+      def redis_set_key(shard_number)
+        "elastic:bulk:initial:#{shard_number}:zset"
+      end
+
+      def redis_score_key(shard_number)
+        "elastic:bulk:initial:#{shard_number}:score"
+      end
+
       def backfill_projects!(*projects)
         track!(*projects)
 

ee/changelogs/unreleased/244865-fix-big-sorted-sets.yml

+---
+title: Use shards for Advanced Search indexing
+merge_request: 55047
+author:
+type: performance

ee/spec/services/elastic/process_bookkeeping_service_spec.rb

@@ -3,26 +3,27 @@
 require 'spec_helper'
 
 RSpec.describe Elastic::ProcessBookkeepingService, :clean_gitlab_redis_shared_state do
-  around do |example|
-    described_class.with_redis do |redis|
-      @redis = redis
-      example.run
-    end
-  end
-
-  let(:zset) { 'elastic:incremental:updates:0:zset' }
-  let(:redis) { @redis }
   let(:ref_class) { ::Gitlab::Elastic::DocumentReference }
 
   let(:fake_refs) { Array.new(10) { |i| ref_class.new(Issue, i, "issue_#{i}", 'project_1') } }
   let(:issue) { fake_refs.first }
   let(:issue_spec) { issue.serialize }
 
+  describe '.shard_number' do
+    it 'returns correct shard number' do
+      shard = described_class.shard_number(ref_class.serialize(fake_refs.first))
+
+      expect(shard).to eq(9)
+    end
+  end
+
   describe '.track' do
     it 'enqueues a record' do
       described_class.track!(issue)
 
-      spec, score = redis.zrange(zset, 0, 0, with_scores: true).first
+      shard = described_class.shard_number(issue_spec)
+
+      spec, score = described_class.queued_items[shard].first
 
       expect(spec).to eq(issue_spec)
       expect(score).to eq(1.0)
@@ -32,11 +33,24 @@ RSpec.describe Elastic::ProcessBookkeepingService, :clean_gitlab_redis_shared_st
       described_class.track!(*fake_refs)
 
       expect(described_class.queue_size).to eq(fake_refs.size)
+      expect(described_class.queued_items.keys).to contain_exactly(0, 1, 3, 4, 6, 8, 9, 10, 13)
+    end
+
+    it 'orders items based on when they were added and moves them to the back of the queue if they were added again' do
+      shard_number = 9
+      item1_in_shard = ref_class.new(Issue, 0, 'issue_0', 'project_1')
+      item2_in_shard = ref_class.new(Issue, 8, 'issue_8', 'project_1')
+
+      described_class.track!(item1_in_shard)
+      described_class.track!(item2_in_shard)
 
-      (spec1, score1), (_, score2), _ = redis.zrange(zset, 0, -1, with_scores: true)
+      expect(described_class.queued_items[shard_number][0]).to eq([item1_in_shard.serialize, 1.0])
+      expect(described_class.queued_items[shard_number][1]).to eq([item2_in_shard.serialize, 2.0])
 
-      expect(score1).to be < score2
-      expect(spec1).to eq(issue_spec)
+      described_class.track!(item1_in_shard)
+
+      expect(described_class.queued_items[shard_number][0]).to eq([item2_in_shard.serialize, 2.0])
+      expect(described_class.queued_items[shard_number][1]).to eq([item1_in_shard.serialize, 3.0])
     end
 
     it 'enqueues 10 identical records as 1 entry' do
@@ -59,8 +73,20 @@ RSpec.describe Elastic::ProcessBookkeepingService, :clean_gitlab_redis_shared_st
       described_class.track!(*fake_refs)
 
       expect(described_class.queue_size).to eq(fake_refs.size)
+    end
+  end
 
-      expect { redis.zadd(zset, 0, 'foo') }.to change(described_class, :queue_size).by(1)
+  describe '.queued_items' do
+    it 'reports queued items' do
+      expect(described_class.queued_items).to be_empty
+
+      described_class.track!(*fake_refs.take(3))
+
+      expect(described_class.queued_items).to eq(
+        4 => [["Issue 1 issue_1 project_1", 1.0]],
+        6 => [["Issue 2 issue_2 project_1", 1.0]],
+        9 => [["Issue 0 issue_0 project_1", 1.0]]
+      )
     end
   end
 
@@ -99,10 +125,26 @@ RSpec.describe Elastic::ProcessBookkeepingService, :clean_gitlab_redis_shared_st
   end
 
   describe '#execute' do
-    let(:limit) { 5 }
+    let(:shard_limit) { 5 }
+    let(:shard_number) { 2 }
+    let(:limit) { shard_limit * shard_number }
 
     before do
-      stub_const('Elastic::ProcessBookkeepingService::LIMIT', limit)
+      stub_const('Elastic::ProcessBookkeepingService::SHARD_LIMIT', shard_limit)
+      stub_const('Elastic::ProcessBookkeepingService::SHARDS_NUMBER', shard_number)
+    end
+
+    context 'limit is less than refs count' do
+      let(:shard_limit) { 2 }
+
+      it 'processes only up to limit' do
+        described_class.track!(*fake_refs)
+
+        expect(described_class.queue_size).to eq(fake_refs.size)
+        allow_processing(*fake_refs)
+
+        expect { described_class.new.execute }.to change(described_class, :queue_size).by(-limit)
+      end
     end
 
     it 'submits a batch of documents' do
@@ -137,7 +179,8 @@ RSpec.describe Elastic::ProcessBookkeepingService, :clean_gitlab_redis_shared_st
 
       expect { described_class.new.execute }.to change(described_class, :queue_size).by(-limit + 1)
 
-      serialized = redis.zrange(zset, -1, -1).first
+      shard = described_class.shard_number(failed.serialize)
+      serialized = described_class.queued_items[shard].first[0]
 
       expect(ref_class.deserialize(serialized)).to eq(failed)
     end
@@ -172,5 +215,13 @@ RSpec.describe Elastic::ProcessBookkeepingService, :clean_gitlab_redis_shared_st
         expect(indexer).to receive(:flush) { failures }
       end
     end
+
+    def allow_processing(*refs, failures: [])
+      expect_next_instance_of(::Gitlab::Elastic::BulkIndexer) do |indexer|
+        refs.each { |ref| allow(indexer).to receive(:process).with(anything) }
+
+        expect(indexer).to receive(:flush) { failures }
+      end
+    end
   end
 end