From 86a65edf922f87bb56503d1027a92cc795890fa8 Mon Sep 17 00:00:00 2001 From: John Cai Date: Wed, 17 Apr 2019 15:16:35 -0700 Subject: Add gitaly session id --- changelogs/unreleased/jc-client-gitaly-session-id.yml | 5 +++++ lib/gitlab/gitaly_client.rb | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 changelogs/unreleased/jc-client-gitaly-session-id.yml diff --git a/changelogs/unreleased/jc-client-gitaly-session-id.yml b/changelogs/unreleased/jc-client-gitaly-session-id.yml new file mode 100644 index 00000000000..ae5b7144b98 --- /dev/null +++ b/changelogs/unreleased/jc-client-gitaly-session-id.yml @@ -0,0 +1,5 @@ +--- +title: Add gitaly session id & catfile-cache feature flag +merge_request: 27472 +author: +type: performance diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 726c4d95da9..7f20d03d0ac 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -219,6 +219,7 @@ module Gitlab metadata['call_site'] = feature.to_s if feature metadata['gitaly-servers'] = address_metadata(remote_storage) if remote_storage metadata['x-gitlab-correlation-id'] = Gitlab::CorrelationId.current_id if Gitlab::CorrelationId.current_id + metadata['gitaly-session-id'] = session_id unless session_id.nil? metadata.merge!(server_feature_flags) @@ -235,7 +236,13 @@ module Gitlab result end - SERVER_FEATURE_FLAGS = %w[].freeze + def self.session_id + return unless feature_enabled?('catfile-cache') + + Gitlab::SafeRequestStore.store[:gitaly_session_id] ||= SecureRandom.uuid + end + + SERVER_FEATURE_FLAGS = %w[catfile-cache].freeze def self.server_feature_flags SERVER_FEATURE_FLAGS.map do |f| -- cgit v1.2.1