Commit c77d7837 authored by John Cai's avatar John Cai

Remove catfile cache feature flag

parent 96277bb9
---
title: Remove catfile cache feature flag
merge_request: 30750
author:
type: performance
...@@ -5,16 +5,12 @@ require 'set' ...@@ -5,16 +5,12 @@ require 'set'
class Feature class Feature
class Gitaly class Gitaly
# Server feature flags should use '_' to separate words. # Server feature flags should use '_' to separate words.
# CATFILE_CACHE sets an incorrect example
CATFILE_CACHE = 'catfile-cache'.freeze
SERVER_FEATURE_FLAGS = SERVER_FEATURE_FLAGS =
[ [
CATFILE_CACHE,
'get_commit_signatures'.freeze 'get_commit_signatures'.freeze
].freeze ].freeze
DEFAULT_ON_FLAGS = Set.new([CATFILE_CACHE]).freeze DEFAULT_ON_FLAGS = Set.new([]).freeze
class << self class << self
def enabled?(feature_flag) def enabled?(feature_flag)
......
...@@ -211,8 +211,7 @@ module Gitlab ...@@ -211,8 +211,7 @@ module Gitlab
metadata['call_site'] = feature.to_s if feature metadata['call_site'] = feature.to_s if feature
metadata['gitaly-servers'] = address_metadata(remote_storage) if remote_storage metadata['gitaly-servers'] = address_metadata(remote_storage) if remote_storage
metadata['x-gitlab-correlation-id'] = Labkit::Correlation::CorrelationId.current_id if Labkit::Correlation::CorrelationId.current_id metadata['x-gitlab-correlation-id'] = Labkit::Correlation::CorrelationId.current_id if Labkit::Correlation::CorrelationId.current_id
metadata['gitaly-session-id'] = session_id if Feature::Gitaly.enabled?(Feature::Gitaly::CATFILE_CACHE) metadata['gitaly-session-id'] = session_id
metadata.merge!(Feature::Gitaly.server_feature_flags) metadata.merge!(Feature::Gitaly.server_feature_flags)
result = { metadata: metadata } result = { metadata: metadata }
......
...@@ -171,17 +171,6 @@ describe Gitlab::GitalyClient do ...@@ -171,17 +171,6 @@ describe Gitlab::GitalyClient do
end end
end end
end end
context 'when catfile-cache feature is disabled' do
before do
stub_feature_flags({ 'gitaly_catfile-cache': false })
end
it 'does not set the gitaly-session-id in the metadata' do
results = described_class.request_kwargs('default', nil)
expect(results[:metadata]).not_to include('gitaly-session-id')
end
end
end end
describe 'enforce_gitaly_request_limits?' do describe 'enforce_gitaly_request_limits?' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment