Merge branch 'feature/sidekiq-cron-config' into 'master'

Sidekiq-cron configuration specific changes for EE

Following the changes at gitlab-org/gitlab-ce!2087, we moved EE specific configurations from `schedule.yml` to `gitlab.yml`, following the discussion at gitlab-org/gitlab-ce#3928

See merge request !78

app/workers/ldap_sync_worker.rb

@@ -4,6 +4,7 @@ class LdapSyncWorker
   sidekiq_options retry: false
 
   def perform
+    return unless Gitlab.config.ldap.enabled
     Rails.logger.info "Performing daily LDAP sync task."
     User.ldap.find_each(batch_size: 100).each do |ldap_user|
       Rails.logger.debug "Syncing user #{ldap_user.username}, #{ldap_user.email}"

config/gitlab.yml.example

@@ -157,6 +157,32 @@ production: &base
     # plain_url: "http://..."     # default: http://www.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
     # ssl_url:   "https://..."    # default: https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon
 
+  ## Auxiliary jobs
+  # Periodically executed jobs, to self-heal GitLab, do external synchronizations, etc.
+  # Please read here for more information: https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
+  cron_jobs:
+    # Flag stuck CI builds as failed
+    stuck_ci_builds_worker:
+      cron: "0 0 * * *"
+
+    ##
+    # GitLab EE only jobs:
+
+    # Snapshot active users statistics
+    historical_data_worker:
+      cron: "0 12 * * *"
+
+    # Update mirrored repositories
+    update_all_mirrors_worker:
+      cron: "0 * * * *"
+
+    # In addition to refreshing users when they log in,
+    # periodically refresh LDAP users membership.
+    # NOTE: This will only take effect if LDAP is enabled
+    ldap_sync_worker:
+      cron: "30 1 * * *"
+
+
   #
   # 2. GitLab CI settings
   # ==========================

config/initializers/1_settings.rb

@@ -297,6 +297,23 @@ Settings.gravatar['plain_url']  ||= 'http://www.gravatar.com/avatar/%{hash}?s=%{
 Settings.gravatar['ssl_url']    ||= 'https://secure.gravatar.com/avatar/%{hash}?s=%{size}&d=identicon'
 Settings.gravatar['host']         = Settings.get_host_without_www(Settings.gravatar['plain_url'])
 
+#
+# Cron Jobs
+#
+Settings['cron_jobs'] ||= Settingslogic.new({})
+Settings.cron_jobs['stuck_ci_builds_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['stuck_ci_builds_worker']['cron'] ||= '0 0 * * *'
+Settings.cron_jobs['stuck_ci_builds_worker']['class'] = 'StuckCiBuildsWorker'
+Settings.cron_jobs['historical_data_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['historical_data_worker']['cron'] ||= '0 12 * * *'
+Settings.cron_jobs['historical_data_worker']['class'] = 'HistoricalDataWorker'
+Settings.cron_jobs['update_all_mirrors_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['update_all_mirrors_worker']['cron'] ||= '0 * * * *'
+Settings.cron_jobs['update_all_mirrors_worker']['class'] = 'UpdateAllMirrorsWorker'
+Settings.cron_jobs['ldap_sync_worker'] ||= Settingslogic.new({})
+Settings.cron_jobs['ldap_sync_worker']['cron'] ||= '30 1 * * *'
+Settings.cron_jobs['ldap_sync_worker']['class'] = 'LdapSyncWorker'
+
 #
 # GitLab Shell
 #
@@ -351,7 +368,7 @@ Settings['kerberos'] ||= Settingslogic.new({})
 Settings.kerberos['enabled'] = false if Settings.kerberos['enabled'].nil?
 Settings.kerberos['keytab'] = nil if Settings.kerberos['keytab'].blank? #nil means use default keytab
 Settings.kerberos['service_principal_name'] = nil if Settings.kerberos['service_principal_name'].blank? #nil means any SPN in keytab
-Settings.kerberos['use_dedicated_port'] = false if Settings.kerberos['use_dedicated_port'].nil? 
+Settings.kerberos['use_dedicated_port'] = false if Settings.kerberos['use_dedicated_port'].nil?
 Settings.kerberos['https'] = Settings.gitlab.https if Settings.kerberos['https'].nil?
 Settings.kerberos['port'] ||= Settings.kerberos.https ? 8443 : 8088
 

config/initializers/sidekiq.rb

@@ -18,11 +18,8 @@ Sidekiq.configure_server do |config|
     chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
   end
 
-  # Sidekiq-cron: load recurring jobs from schedule.yml
-  schedule_file = 'config/schedule.yml'
-  if File.exists?(schedule_file)
-    Sidekiq::Cron::Job.load_from_hash YAML.load(ERB.new(File.read(schedule_file)).result)
-  end
+  # Sidekiq-cron: load recurring jobs from gitlab.yml
+  Sidekiq::Cron::Job.load_from_hash! Gitlab.config.cron_jobs
 
   # Database pool should be at least `sidekiq_concurrency` + 2
   # For more info, see: https://github.com/mperham/sidekiq/blob/master/4.0-Upgrade.md

config/schedule.yml

-# Here is a list of jobs that are scheduled to run periodically.
-# We use a UNIX cron notation to specify execution schedule.
-#
-# Please read here for more information:
-# https://github.com/ondrejbartas/sidekiq-cron#adding-cron-job
-
-stuck_ci_builds_worker:
-  cron: "0 0 * * *"
-  class: "StuckCiBuildsWorker"
-  queue: "default"
-
-#
-# GitLab EE only jobs:
-#
-
-historical_data_worker:
-  cron: "0 12 * * *"
-  class: "HistoricalDataWorker"
-  queue: "default"
-
-update_all_mirrors_worker:
-  cron: "0 * * * *"
-  class: "UpdateAllMirrorsWorker"
-  queue: "default"
-
-<% if Gitlab.config.ldap.enabled %>
-# In addition to refreshing users when they log in,
-# enabling this setting will refresh LDAP user membership once a day.
-# Default time of the day when this will happen is at 1:30am server time.
-ldap_sync_worker:
-  cron: "30 1 * * *"
-  class: "LdapSyncWorker"
-  queue: "default"
-<% end %>