Merge branch 'wc/unwrap-gitaly' into 'master'

Add 'use_wrapper' setting to Gitaly

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7281

Merged-by: Andrew Patterson <[email protected]>
Approved-by: Sami Hiltunen <[email protected]>
Approved-by: Clemens Beck <[email protected]>
Approved-by: Andrew Patterson <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Reviewed-by: Will Chandler <[email protected]>
Reviewed-by: Clemens Beck <[email protected]>
Co-authored-by: Will Chandler <[email protected]>

Author: Andrew Patterson

files/gitlab-config-template/gitlab.rb.template

@@ -2502,6 +2502,7 @@ external_url 'GENERATED_EXTERNAL_URL'
 # gitaly['dir'] = "/var/opt/gitlab/gitaly"
 # gitaly['log_group'] = nil
 # gitaly['bin_path'] = "/opt/gitlab/embedded/bin/gitaly"
+# gitaly['use_wrapper'] = true
 # gitaly['env_directory'] = "/opt/gitlab/etc/gitaly/env"
 # gitaly['env'] = {
 #  'PATH' => "/opt/gitlab/bin:/opt/gitlab/embedded/bin:/bin:/usr/bin",

files/gitlab-cookbooks/gitaly/attributes/default.rb

@@ -8,6 +8,7 @@
 default['gitaly']['consul_service_name'] = 'gitaly'
 default['gitaly']['consul_service_meta'] = nil
 default['gitaly']['log_group'] = nil
+default['gitaly']['use_wrapper'] = true
 
 default['gitaly']['configuration'] = {
   runtime_dir: "#{node['gitaly']['dir']}/run",

files/gitlab-cookbooks/gitaly/recipes/enable.rb

@@ -30,6 +30,7 @@
 runtime_dir = node.dig('gitaly', 'configuration', 'runtime_dir')
 cgroups_mountpoint = node.dig('gitaly', 'configuration', 'cgroups', 'mountpoint')
 cgroups_hierarchy_root = node.dig('gitaly', 'configuration', 'cgroups', 'hierarchy_root')
+use_wrapper = node['gitaly']['use_wrapper']
 
 directory working_dir do
   owner account_helper.gitlab_user
@@ -145,6 +146,7 @@
     open_files_ulimit: open_files_ulimit,
     cgroups_mountpoint: cgroups_mountpoint,
     cgroups_hierarchy_root: cgroups_hierarchy_root,
+    use_wrapper: use_wrapper,
   }.merge(params))
   log_options logging_settings[:options]
 end

files/gitlab-cookbooks/gitaly/templates/default/sv-gitaly-run.erb

@@ -24,4 +24,8 @@ cd <%= @options[:working_dir] %>
 exec chpst -e <%= @options[:env_dir] %> -P \
   -U <%= @options[:user] %>:<%= @options[:groupname] %> \
   -u <%= @options[:user] %>:<%= @options[:groupname] %> \
-  <%= @options[:wrapper_path] %> <%= @options[:bin_path] %> <%= @options[:config_path] %>
+<% if @options[:use_wrapper] %>
+  <%= @options[:wrapper_path] %> <%= @options[:bin_path] %> serve <%= @options[:config_path] %>
+<% else %>
+  <%= @options[:bin_path] %> serve <%= @options[:config_path] %>
+<% end %>

spec/chef/cookbooks/gitaly/recipes/gitaly_spec.rb

@@ -698,6 +698,30 @@
         .with_content(/svlogd -tt \/var\/log\/gitlab\/gitaly/)
     end
 
+    context 'when use_wrapper is defined' do
+      context 'with wrapper enabled' do
+        before do
+          stub_gitlab_rb(gitaly: { use_wrapper: true })
+        end
+
+        it 'renders the runit run script with the wrapper' do
+          expect(chef_run).to render_file('/opt/gitlab/sv/gitaly/run')
+            .with_content(/\/opt\/gitlab\/embedded\/bin\/gitaly-wrapper/)
+        end
+      end
+
+      context 'with wrapper disabled' do
+        before do
+          stub_gitlab_rb(gitaly: { use_wrapper: false })
+        end
+
+        it 'renders the runit run script without the wrapper' do
+          expect(chef_run).not_to render_file('/opt/gitlab/sv/gitaly/run')
+            .with_content(/\/opt\/gitlab\/embedded\/bin\/gitaly-wrapper/)
+        end
+      end
+    end
+
     context 'when using git_data_dirs storage configuration' do
       context 'using local gitaly' do
         before do