diff --git a/config/feature_flags/gitlab_com_derisk/use_primary_and_secondary_stores_for_sessions.yml b/config/feature_flags/gitlab_com_derisk/use_primary_and_secondary_stores_for_sessions.yml deleted file mode 100644 index a94f8ae3249095d2f9a23184407011bfb6bcd609..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/use_primary_and_secondary_stores_for_sessions.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: use_primary_and_secondary_stores_for_sessions -feature_issue_url: https://gitlab.com/gitlab-com/gl-infra/data-access/durability/team/-/issues/28 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/175735 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/509337 -milestone: '17.9' -group: group::durability -type: gitlab_com_derisk -default_enabled: false diff --git a/config/feature_flags/gitlab_com_derisk/use_primary_store_as_default_for_sessions.yml b/config/feature_flags/gitlab_com_derisk/use_primary_store_as_default_for_sessions.yml deleted file mode 100644 index c2f8b4b29dd8cdb7fb66d5db679a2f1fee9092f8..0000000000000000000000000000000000000000 --- a/config/feature_flags/gitlab_com_derisk/use_primary_store_as_default_for_sessions.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: use_primary_store_as_default_for_sessions -feature_issue_url: https://gitlab.com/gitlab-com/gl-infra/data-access/durability/team/-/issues/28 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/175735 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/509338 -milestone: '17.9' -group: group::durability -type: gitlab_com_derisk -default_enabled: false diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb index dd66d1d51c7b63631d9291d293137632b7c5c4db..cfd2ada7b2e1efa224c67985ac82db9d0c8f38d3 100644 --- a/lib/gitlab/redis.rb +++ b/lib/gitlab/redis.rb @@ -10,7 +10,6 @@ module Redis ALL_CLASSES = [ Gitlab::Redis::BufferedCounter, Gitlab::Redis::Cache, - Gitlab::Redis::ClusterSessions, Gitlab::Redis::DbLoadBalancing, Gitlab::Redis::FeatureFlag, *Gitlab::Redis::Queues.instances.values, # dynamically adds QueueShard* classes diff --git a/lib/gitlab/redis/cluster_sessions.rb b/lib/gitlab/redis/cluster_sessions.rb deleted file mode 100644 index caaad3c29ad7e0cd55e873f43296ae15474144de..0000000000000000000000000000000000000000 --- a/lib/gitlab/redis/cluster_sessions.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Redis - class ClusterSessions < ::Gitlab::Redis::Wrapper - class << self - # The data we store on Sessions used to be stored on SharedState. - def config_fallback - SharedState - end - end - end - end -end diff --git a/lib/gitlab/redis/sessions.rb b/lib/gitlab/redis/sessions.rb index 093f896dbd36dee513f8ccf7d5d113c652b3675a..ddcfdf6e7984fe2a4f0bab39176e0a90ba92ce78 100644 --- a/lib/gitlab/redis/sessions.rb +++ b/lib/gitlab/redis/sessions.rb @@ -2,7 +2,7 @@ module Gitlab module Redis - class Sessions < ::Gitlab::Redis::MultiStoreWrapper + class Sessions < ::Gitlab::Redis::Wrapper SESSION_NAMESPACE = 'session:gitlab' USER_SESSIONS_NAMESPACE = 'session:user:gitlab' USER_SESSIONS_LOOKUP_NAMESPACE = 'session:lookup:user:gitlab' @@ -13,10 +13,6 @@ class Sessions < ::Gitlab::Redis::MultiStoreWrapper def self.config_fallback SharedState end - - def self.multistore - MultiStore.create_using_pool(ClusterSessions.pool, pool, store_name) - end end end end diff --git a/spec/lib/gitlab/redis/cluster_sessions_spec.rb b/spec/lib/gitlab/redis/cluster_sessions_spec.rb deleted file mode 100644 index e4cfce056630d1e9ca8cbb99dfae518122923b91..0000000000000000000000000000000000000000 --- a/spec/lib/gitlab/redis/cluster_sessions_spec.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe Gitlab::Redis::ClusterSessions, feature_category: :scalability do - include_examples "redis_new_instance_shared_examples", 'cluster_sessions', Gitlab::Redis::SharedState -end diff --git a/spec/lib/gitlab/redis/sessions_spec.rb b/spec/lib/gitlab/redis/sessions_spec.rb index 0cfba8ed9a079c26e93f4d7b65a8805fbffee539..6ff261bb475c507bf46d092d07fa8a9f63e78a58 100644 --- a/spec/lib/gitlab/redis/sessions_spec.rb +++ b/spec/lib/gitlab/redis/sessions_spec.rb @@ -3,7 +3,6 @@ require 'spec_helper' RSpec.describe Gitlab::Redis::Sessions, feature_category: :shared do - include_examples "multi_store_wrapper_shared_examples" include_examples "redis_new_instance_shared_examples", 'sessions', Gitlab::Redis::SharedState describe '#store' do @@ -14,9 +13,4 @@ expect([::Redis::Store, ::Gitlab::Redis::ClusterStore].include?(store.class)).to eq(true) end end - - it 'migrates from self to ClusterSessions' do - expect(described_class.multistore.secondary_pool).to eq(described_class.pool) - expect(described_class.multistore.primary_pool).to eq(Gitlab::Redis::ClusterSessions.pool) - end end