Merge branch 'sc1-shard-feature-flag' into 'master'

Add new Redis singleton to shard out feature flags See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119279 Merged-by: Marius Bobin <mbobin@gitlab.com> Approved-by: Gregorius Marco <gmarco@gitlab.com> Approved-by: Marius Bobin <mbobin@gitlab.com> Approved-by: Alejandro Rodríguez <alejandro@gitlab.com> Reviewed-by: Alejandro Rodríguez <alejandro@gitlab.com> Co-authored-by: Alejandro Rodríguez <alejandro@gitlab.com> Co-authored-by: Sylvester Chin <schin@gitlab.com>

Merge branch 'sc1-shard-feature-flag' into 'master'
Add new Redis singleton to shard out feature flags See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119279 Merged-by: Marius Bobin <mbobin@gitlab.com> Approved-by: Gregorius Marco <gmarco@gitlab.com> Approved-by: Marius Bobin <mbobin@gitlab.com> Approved-by: Alejandro Rodríguez <alejandro@gitlab.com> Reviewed-by: Alejandro Rodríguez <alejandro@gitlab.com> Co-authored-by: Alejandro Rodríguez <alejandro@gitlab.com> Co-authored-by: Sylvester Chin <schin@gitlab.com>
fa51b07e · Marius Bobin · 369fbb42 · 1fcfc5b3 · fa51b07e · fa51b07e
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -326,7 +326,7 @@ def l1_cache_backend
    end
    def l2_cache_backend
-      Rails.cache
+      ::Gitlab::Redis::FeatureFlag.cache_store
    end
    def log(key:, action:, **extra)

--- a/lib/gitlab/redis.rb
+++ b/lib/gitlab/redis.rb
@@ -10,6 +10,7 @@ module Redis
    ALL_CLASSES = [
      Gitlab::Redis::Cache,
      Gitlab::Redis::DbLoadBalancing,
+      Gitlab::Redis::FeatureFlag,
      Gitlab::Redis::Queues,
      Gitlab::Redis::RateLimiting,
      Gitlab::Redis::RepositoryCache,

--- a/lib/gitlab/redis/feature_flag.rb
+++ b/lib/gitlab/redis/feature_flag.rb
+# frozen_string_literal: true
+module Gitlab
+  module Redis
+    class FeatureFlag < ::Gitlab::Redis::Wrapper
+      FeatureFlagStore = Class.new(ActiveSupport::Cache::RedisCacheStore)
+      class << self
+        # The data we store on FeatureFlag is currently stored on Cache.
+        def config_fallback
+          Cache
+        end
+        def cache_store
+          @cache_store ||= FeatureFlagStore.new(
+            redis: pool,
+            compress: Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1')),
+            namespace: Cache::CACHE_NAMESPACE,
+            expires_in: 1.hour
+          )
+        end
+      end
+    end
+  end
+end
--- a/spec/lib/feature_spec.rb
+++ b/spec/lib/feature_spec.rb
@@ -2,7 +2,7 @@
 require 'spec_helper'
-RSpec.describe Feature, stub_feature_flags: false, feature_category: :shared do
+RSpec.describe Feature, :clean_gitlab_redis_feature_flag, stub_feature_flags: false, feature_category: :shared do
  include StubVersion
  before do
@@ -212,7 +212,7 @@
    end
    it { expect(described_class.send(:l1_cache_backend)).to eq(Gitlab::ProcessMemoryCache.cache_backend) }
-    it { expect(described_class.send(:l2_cache_backend)).to eq(Rails.cache) }
+    it { expect(described_class.send(:l2_cache_backend)).to eq(Gitlab::Redis::FeatureFlag.cache_store) }
    it 'caches the status in L1 and L2 caches',
       :request_store, :use_clean_rails_memory_store_caching do

--- a/spec/lib/gitlab/redis/feature_flag_spec.rb
+++ b/spec/lib/gitlab/redis/feature_flag_spec.rb
+# frozen_string_literal: true
+require 'spec_helper'
+RSpec.describe Gitlab::Redis::FeatureFlag, feature_category: :redis do
+  include_examples "redis_new_instance_shared_examples", 'feature_flag', Gitlab::Redis::Cache
+  describe '.cache_store' do
+    it 'has a default ttl of 1 hour' do
+      expect(described_class.cache_store.options[:expires_in]).to eq(1.hour)
+    end
+  end
+end