Commit 4047e5b8 authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'jc-client-gitaly-session-id' into 'master'

Add gitaly session id & catfile-cache feature flag

See merge request gitlab-org/gitlab-ce!27472
parents cd5e7ad4 fe31f63c
---
title: Add gitaly session id & catfile-cache feature flag
merge_request: 27472
author:
type: performance
...@@ -31,6 +31,9 @@ module Gitlab ...@@ -31,6 +31,9 @@ module Gitlab
MAXIMUM_GITALY_CALLS = 30 MAXIMUM_GITALY_CALLS = 30
CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze CLIENT_NAME = (Sidekiq.server? ? 'gitlab-sidekiq' : 'gitlab-web').freeze
SERVER_FEATURE_CATFILE_CACHE = 'catfile-cache'.freeze
SERVER_FEATURE_FLAGS = [SERVER_FEATURE_CATFILE_CACHE].freeze
MUTEX = Mutex.new MUTEX = Mutex.new
define_histogram :gitaly_controller_action_duration_seconds do define_histogram :gitaly_controller_action_duration_seconds do
...@@ -219,6 +222,7 @@ module Gitlab ...@@ -219,6 +222,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_enabled?(SERVER_FEATURE_CATFILE_CACHE)
metadata.merge!(server_feature_flags) metadata.merge!(server_feature_flags)
...@@ -235,7 +239,9 @@ module Gitlab ...@@ -235,7 +239,9 @@ module Gitlab
result result
end end
SERVER_FEATURE_FLAGS = %w[].freeze def self.session_id
Gitlab::SafeRequestStore[:gitaly_session_id] ||= SecureRandom.uuid
end
def self.server_feature_flags def self.server_feature_flags
SERVER_FEATURE_FLAGS.map do |f| SERVER_FEATURE_FLAGS.map do |f|
......
...@@ -142,6 +142,48 @@ describe Gitlab::GitalyClient do ...@@ -142,6 +142,48 @@ describe Gitlab::GitalyClient do
end end
end end
describe '.request_kwargs' do
context 'when catfile-cache feature is enabled' do
before do
stub_feature_flags('gitaly_catfile-cache': true)
end
it 'sets the gitaly-session-id in the metadata' do
results = described_class.request_kwargs('default', nil)
expect(results[:metadata]).to include('gitaly-session-id')
end
context 'when RequestStore is not enabled' do
it 'sets a different gitaly-session-id per request' do
gitaly_session_id = described_class.request_kwargs('default', nil)[:metadata]['gitaly-session-id']
expect(described_class.request_kwargs('default', nil)[:metadata]['gitaly-session-id']).not_to eq(gitaly_session_id)
end
end
context 'when RequestStore is enabled', :request_store do
it 'sets the same gitaly-session-id on every outgoing request metadata' do
gitaly_session_id = described_class.request_kwargs('default', nil)[:metadata]['gitaly-session-id']
3.times do
expect(described_class.request_kwargs('default', nil)[:metadata]['gitaly-session-id']).to eq(gitaly_session_id)
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
describe 'enforce_gitaly_request_limits?' do describe 'enforce_gitaly_request_limits?' do
def call_gitaly(count = 1) def call_gitaly(count = 1)
(1..count).each do (1..count).each 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