Merge branch 'master' of gitlab.com:gitlab-org/omnibus-gitlab

CHANGELOG.md

@@ -6,6 +6,7 @@ omnibus-gitlab repository.
 9.3.0
 - Rename geo_download_dispatch worker configuration
+- Rename geo_backfill worker configuration
 9.2.0

Rakefile

@@ -6,5 +6,5 @@ Knapsack.load_tasks
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new(:rubocop) do |t|
-  t.options = ['-D', 'config', 'lib', 'spec', 'files/gitlab-ctl-commands', 'files/gitlab-cookbooks/gitlab-ee']
+  t.options = ['-D', 'config', 'lib', 'spec', 'files/gitlab-ctl-commands', 'files/gitlab-cookbooks/gitlab-ee', 'files/gitlab-cookbooks/runit']
 end

doc/architecture/README.md

@@ -93,10 +93,52 @@ Omnibus-GitLab repository uses ChefSpec to test the cookbooks and recipes it shi
 So, of the components described above, some (software definitions, project metadata, tests, etc.) find use during the package building, in a build environment, and some (Chef cookbooks and recipes, GitLab configuration file, Runit, gitlab-ctl commands, etc.) are used to configure the user's installed instance.
 ## Work life cycle of Omnibus-GitLab
-### What happens during Package Building
-When packages are built using the `omnibus build` command, a few steps are completed in the background. The main step of this is collecting all the dependency softwares whose definitions are available. This involves parsing the software definitions, finding out the necessary version, getting their corresponding source codes from prescribed URL, and building them as specified in those software definitions. This is followed by a HealthCheck, that checks the licenses of all the dependencies and see if they are all present, valid, and compatible with the Omnibus-GitLab licensing. The next step involves actual package building, which depends on the host OS in which the command is run, i.e. a .deb package is created if ran on a Debian OS. Package building uses the metadata provided in the project definition like name, description, maintainer, conflict and replace relations, etc. The package consists of all the defined softwares embedded in it, global configuration file, the necessary cookbooks, and other package specific control files, metadata, and scripts.
+### What happens during package building
+The type of packages being built depends on the OS the build process is run. If build is done on a Debian environment, a `.deb` package will be created. What happens during package building can be summarized to the following steps
+1. Fetching sources of dependency softwares
+    1. Parsing software definitions to find out corresponding versions
+    1. Getting source code from remotes or cache
+1. Building individual software components
+    1. Setting up necessary environment variables and flags
+    1. Applying patches, if applicable
+    1. Performing the build and installation of the component, which involves installing it to appropriate location (inside `/opt/gitlab`)
+1. Generating license information of all bundled components - including external softwares, Ruby gems, JS modules etc. This involves analysing definitions of each dependencies as well as any additional licensing document provided by the components (like `licenses.csv` file provided by gitlab-rails)
+1. Checking license of the components to make sure we are not shipping a component with a non-compatible license
+1. Running a health check on the package to make sure the binaries are linked against available libraries. For bundled libraries, the binaries should link against them and not the one available globally.
+1. Building the package with contents of `/opt/gitlab`. This makes use of the metadata given inside [gitlab.rb](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/config/projects/gitlab.rb) file. This includes package name, version, maintainer, homepage, information regarding conflicts with other packages etc.
+
+#### Caching
+
+Omnibus uses two types of cache to optimize the build process- one to store the software artifacts (sources of dependent softwares), and one to store the project tree after each software component is built
+
+##### Software artifact cache (for GitLab Inc builds)
+
+Software artifact cache uses an Amazon S3 bucket to store the sources of the dependent softwares. In our build process, this cache is populated using the command `bin/omnibus cache populate`. This will pull in all the necessary software sources from the Amazon bucket and store it in the necessary locations. When there is a change in the version requirement of a software, omnibus pulls it from the original upstream and add it to the artifact cache. This process is internal to omnibus and we configure the Amazon bucket to use in [omnibus.rb](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/omnibus.rb) file available in the root of the repository. This cache ensures availability of the dependent softwares even if their original upstream remotes go down.
+
+##### Build cache
+
+A second type of cache that plays an important role in our build process is the build cache. Build cache can be described in simple words as snapshots of the project tree (where the project actually gets built - `/opt/gitlab`) after each dependent software is built. To understand it easily, consider a project with 5 dependent softwares - A, B, C, D and E, built in that order. For simplicity, we are not considering the dependencies of these individual softwares. Build cache makes use of git tags to make snapshots. After each software is built, a git tag is computed and committed. Now, consider we made some change to the definition of software D. A, B, C and E remains the same. When we try to build again, omnibus can reuse the snapshot that was made before D was built in the previous build. Thus, the time taken to build A, B and C can be saved as it can simply checkout the snapshot that was made after C was built. Omnibus uses the snapshot just before the software which "dirtied" the cache (dirtying can happen either by a change in the software definition, a change in name/version of a previous component, or a change in version of the current component) was built. Similarly, if in a build there is a change in definition of software A, it will dirty the cache and hence A and all the following dependencies get built from scratch. If C dirties the cache, A and B gets reused and C, D and E gets built again from scratch.
+
+This cache makes sense only if it is retained across builds. For that, we use the caching mechanism of GitLab CI. We have a dedicated runner which is configured to store its internal cache in an Amazon bucket. Before each build, we pull in this cache (`restore_cache_bundle` target in out Makefile), move it to appropriate location and start the build. It gets used by the omnibus until the point of dirtying. After the build, we pack the new cache and tells CI to back it up to the Amazon bucket (`pack_cache_bundle` in our Makefile).
+
+Both types of cache reduce the overall build time of GitLab and dependencies on external factors.
+
+The cache mechanism can be summarised as follows:
+1. For each software dependency
+  1. Parse definition to understand version and SHA256
+  1. If the source file tarball available in artifact cache in Amazon bucket matches the version and SHA256, use it
+  1. Else, download the correct tarball from the upstream remote
+1. Get build cache from CI cache
+1. For each software dependency
+  1. If cache has been dirtied, break the loop
+  1. Else, checkout the snapshot
+1. If there are remaining dependencies
+  1. For each remaining  dependency
+    1. Build the dependency
+    2. Create a snapshot and commit it
+1. Push back the new build cache to CI cache
 ### What happens during `gitlab-ctl reconfigure`
-One of the commonly used commands while managing a GitLab instance is `gitlab-ctl reconfigure`. This command, in short, parses the config file and runs the recipes with the values supplied from it. The recipes to be run are defined in a file called `dna.json` present in the `embedded` folder inside the installation directory (This file is generated by a software dependency named `gitlab-cookbooks` that is defined in the software definitions). In case of GitLab CE, the cookbook named `gitlab` will be selected as the master recipe, which in-turn invokes all other necessary recipes, including runit. So, reconfigure is basically a chef-client run that configures different files and services with the values provided in configuration template.
+One of the commonly used commands while managing a GitLab instance is `gitlab-ctl reconfigure`. This command, in short, parses the config file and runs the recipes with the values supplied from it. The recipes to be run are defined in a file called `dna.json` present in the `embedded` folder inside the installation directory (This file is generated by a software dependency named `gitlab-cookbooks` that is defined in the software definitions). In case of GitLab CE, the cookbook named `gitlab` will be selected as the master recipe, which in-turn invokes all other necessary recipes, including runit. In short, reconfigure is basically a chef-client run that configures different files and services with the values provided in configuration template.

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

@@ -1405,8 +1405,8 @@ external_url 'GENERATED_EXTERNAL_URL'
 ################################################################################
 #
 # gitlab_rails['geo_bulk_notify_worker_cron'] = "*/10 * * * * *"
-# gitlab_rails['geo_backfill_worker_cron'] = "*/5 * * * *"
 # gitlab_rails['geo_file_download_dispatch_worker_cron'] = "*/10 * * * *"
+# gitlab_rails['geo_repository_sync_worker_cron'] = "*/5 * * * *"
 # gitlab_rails['ldap_sync_worker_cron'] = "30 1 * * *"
 # gitlab_rails['ldap_group_sync_worker_cron'] = "0 * * * *"
 # gitlab_rails['historical_data_worker_cron'] = "0 12 * * *"

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

@@ -111,8 +111,8 @@ default['gitlab']['gitlab-rails']['historical_data_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['ldap_sync_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['ldap_group_sync_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['geo_bulk_notify_worker_cron'] = nil
-default['gitlab']['gitlab-rails']['geo_backfill_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['geo_file_download_dispatch_worker_cron'] = nil
+default['gitlab']['gitlab-rails']['geo_repository_sync_worker_cron'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_enabled'] = false
 default['gitlab']['gitlab-rails']['incoming_email_address'] = nil
 default['gitlab']['gitlab-rails']['incoming_email_host'] = nil

files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb

@@ -217,11 +217,11 @@ production: &base
       cron: "<%= @geo_bulk_notify_worker_cron %>"
     <% end %>
-    # GitLab Geo backfill worker
+    # GitLab Geo repository sync worker
     # NOTE: This will only take effect if Geo is enabled
-    <% unless @geo_backfill_worker_cron.nil? %>
-    geo_backfill_worker:
-      cron: "<%= @geo_backfill_worker_cron %>"
+    <% unless @geo_repository_sync_worker_cron.nil? %>
+    geo_repository_sync_worker:
+      cron: "<%= @geo_repository_sync_worker_cron %>"
     <% end %>
     # GitLab Geo file download dispatch worker

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

@@ -22,4 +22,3 @@ default[:runit][:sv_bin] = "/opt/gitlab/embedded/bin/sv"
 default[:runit][:chpst_bin] = "/opt/gitlab/embedded/bin/chpst"
 default[:runit][:service_dir] = "/opt/gitlab/service"
 default[:runit][:sv_dir] = "/opt/gitlab/sv"
-

files/gitlab-cookbooks/runit/definitions/runit_service.rb

@@ -18,8 +18,7 @@
 # limitations under the License.
 #
-define :runit_service, :directory => nil, :only_if => false, :finish_script => false, :control => [], :run_restart => true, :active_directory => nil, :init_script_template => nil, :owner => "root", :group => "root", :template_name => nil, :start_command => "start", :stop_command => "stop", :restart_command => "restart", :status_command => "status", :options => Hash.new, :log_options => Hash.new, :env => Hash.new, :action => :enable, :down => false do
-
+define :runit_service, directory: nil, only_if: false, finish_script: false, control: [], run_restart: true, active_directory: nil, init_script_template: nil, owner: "root", group: "root", template_name: nil, start_command: "start", stop_command: "stop", restart_command: "restart", status_command: "status", options: {}, log_options: {}, env: {}, action: :enable, down: false do
   include_recipe "runit"
   omnibus_helper = OmnibusHelper.new(node)
@@ -30,12 +29,11 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
   sv_dir_name = "#{params[:directory]}/#{params[:name]}"
   service_dir_name = "#{params[:active_directory]}/#{params[:name]}"
-  params[:options].merge!(:env_dir => "#{sv_dir_name}/env") unless params[:env].empty?
+  params[:options][:env_dir] = "#{sv_dir_name}/env" unless params[:env].empty?
   case params[:action]
   when :enable
-
     directory sv_dir_name do
       owner params[:owner]
       group params[:group]
@@ -64,7 +62,7 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
       source "sv-#{params[:template_name]}-run.erb"
       cookbook params[:cookbook] if params[:cookbook]
       if params[:options].respond_to?(:has_key?)
-        variables :options => params[:options]
+        variables options: params[:options]
       end
     end
@@ -75,7 +73,7 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
       source "sv-#{params[:template_name]}-log-run.erb"
       cookbook params[:cookbook] if params[:cookbook]
       if params[:options].respond_to?(:has_key?)
-        variables :options => params[:options]
+        variables options: params[:options]
       end
     end
@@ -128,7 +126,7 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
         source "sv-#{params[:template_name]}-finish.erb"
         cookbook params[:cookbook] if params[:cookbook]
         if params[:options].respond_to?(:has_key?)
-          variables :options => params[:options]
+          variables options: params[:options]
         end
       end
     end
@@ -149,7 +147,7 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
           source "sv-#{params[:template_name]}-control-#{signal}.erb"
           cookbook params[:cookbook] if params[:cookbook]
           if params[:options].respond_to?(:has_key?)
-            variables :options => params[:options]
+            variables options: params[:options]
           end
         end
       end
@@ -162,14 +160,12 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
         mode 0755
         source params[:init_script_template]
         if params[:options].respond_to?(:has_key?)
-          variables :options => params[:options]
+          variables options: params[:options]
         end
       end
-    else
-      if params[:active_directory] == node[:runit][:service_dir]
-        link "/opt/gitlab/init/#{params[:name]}" do
-          to node[:runit][:sv_bin]
-        end
+    elsif params[:active_directory] == node[:runit][:service_dir]
+      link "/opt/gitlab/init/#{params[:name]}" do
+        to node[:runit][:sv_bin]
       end
     end
@@ -182,7 +178,7 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
     ruby_block "supervise_#{params[:name]}_sleep" do
       block do
         Chef::Log.debug("Waiting until named pipe #{sv_dir_name}/supervise/ok exists.")
-        until ::FileTest.pipe?("#{sv_dir_name}/supervise/ok") do
+        until ::FileTest.pipe?("#{sv_dir_name}/supervise/ok")
           sleep 1
           Chef::Log.debug(".")
         end
@@ -196,13 +192,13 @@ define :runit_service, :directory => nil, :only_if => false, :finish_script => f
         control_cmd = "#{node[:runit][:chpst_bin]} -u #{params[:owner]} #{control_cmd}"
       end
       provider Chef::Provider::Service::Simple
-      supports :restart => true, :status => true
+      supports restart: true, status: true
       start_command "#{control_cmd} #{params[:start_command]} #{service_dir_name}"
       stop_command "#{control_cmd} #{params[:stop_command]} #{service_dir_name}"
       restart_command "#{control_cmd} #{params[:restart_command]} #{service_dir_name}"
       status_command "#{control_cmd} #{params[:status_command]} #{service_dir_name}"
       if params[:run_restart] && omnibus_helper.should_notify?(params[:name])
-        subscribes :restart, resources(:template => "#{sv_dir_name}/run"), :delayed
+        subscribes :restart, resources(template: "#{sv_dir_name}/run"), :delayed
       end
       action :nothing
     end

files/gitlab-cookbooks/runit/metadata.rb

@@ -8,6 +8,6 @@ depends           "package"
 recipe "runit", "Installs and configures runit"
-%w{ ubuntu debian gentoo }.each do |os|
+%w(ubuntu debian gentoo).each do |os|
   supports os
 end

spec/chef/recipes/gitlab-rails_spec.rb

@@ -175,19 +175,19 @@ describe 'gitlab::gitlab-rails' do
     end
     context 'GitLab Geo settings' do
-      context 'when backfill worker is configured' do
+      context 'when repository sync worker is configured' do
         it 'sets the cron value' do
-          stub_gitlab_rb(gitlab_rails: { geo_backfill_worker_cron: '1 2 3 4 5' })
+          stub_gitlab_rb(gitlab_rails: { geo_repository_sync_worker_cron: '1 2 3 4 5' })
           expect(chef_run).to render_file(gitlab_yml_path)
-            .with_content(/geo_backfill_worker:\s+cron:\s+"1 2 3 4 5"/)
+            .with_content(/geo_repository_sync_worker:\s+cron:\s+"1 2 3 4 5"/)
         end
       end
-      context 'when backfill worker is not configured' do
+      context 'when repository sync worker is not configured' do
         it 'does not set the cron value' do
           expect(chef_run).to render_file(gitlab_yml_path).with_content { |content|
-            expect(content).not_to include('geo_backfill_worker')
+            expect(content).not_to include('geo_repository_sync_worker')
           }
         end
       end
@@ -211,7 +211,7 @@ describe 'gitlab::gitlab-rails' do
     end
     context 'Scheduled Pipeline settings' do
-      context 'when the corn pattern is configured' do
+      context 'when the cron pattern is configured' do
         it 'sets the cron value' do
           stub_gitlab_rb(gitlab_rails: { pipeline_schedule_worker_cron: '41 * * * *' })
@@ -219,14 +219,6 @@ describe 'gitlab::gitlab-rails' do
             .with_content(/pipeline_schedule_worker:\s+cron:\s+"41/)
         end
       end
-
-      context 'when backfill worker is not configured' do
-        it 'does not set the cron value' do
-          expect(chef_run).to render_file(gitlab_yml_path).with_content { |content|
-            expect(content).not_to include('geo_backfill_worker')
-          }
-        end
-      end
     end
     context 'Gitaly settings' do