diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-05-31 11:11:50 +0300 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-06-06 11:49:48 +0300 |
| commit | 10acdc30df99ede1356493c14a57b94ed1ae7950 (patch) | |
| tree | bdb3bd43181fe5ad4aaf5e1e31461de4ec07207d | |
| parent | fb1e35e556f50636645d48c739dad37a4c7f722c (diff) | |
Rename find_stale. Fix worker name in declaration.
| -rw-r--r-- | app/models/ci/build_trace_chunk.rb | 2 | ||||
| -rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
| -rw-r--r-- | app/workers/ci/rescue_stale_live_trace_worker.rb | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/models/ci/build_trace_chunk.rb b/app/models/ci/build_trace_chunk.rb index 4884e355c36..f17d8a07b13 100644 --- a/app/models/ci/build_trace_chunk.rb +++ b/app/models/ci/build_trace_chunk.rb @@ -52,7 +52,7 @@ module Ci end # Find stale live traces and return their build ids - def find_stale(finished_before: 1.hour.ago) + def find_stale_in_batches(finished_before: 1.hour.ago) include(EachBatch) .select(:build_id) .group(:build_id) diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 85d9dcbc3c9..81e971a67d0 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -17,7 +17,7 @@ - cronjob:stuck_ci_jobs - cronjob:stuck_import_jobs - cronjob:stuck_merge_jobs -- cronjob:rescue_stale_live_trace +- cronjob:ci_rescue_stale_live_trace - cronjob:trending_projects - cronjob:issue_due_scheduler diff --git a/app/workers/ci/rescue_stale_live_trace_worker.rb b/app/workers/ci/rescue_stale_live_trace_worker.rb index 0f196993669..be0194b63ae 100644 --- a/app/workers/ci/rescue_stale_live_trace_worker.rb +++ b/app/workers/ci/rescue_stale_live_trace_worker.rb @@ -9,7 +9,7 @@ module Ci # The targets are jobs with the following conditions # - Jobs had been finished 1 hour ago, but they don't have an archived trace yet # This could happen when their sidekiq-jobs are lost by SIGKILL - Ci::BuildTraceChunk.find_stale(finished_before: 1.hour.ago) do |build_ids| + Ci::BuildTraceChunk.find_stale_in_batches(finished_before: 1.hour.ago) do |build_ids| Ci::Build.where(id: build_ids).find_each do |build| begin build.trace.archive! diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index ed6a8a9b3db..165f838e432 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -289,9 +289,9 @@ Settings.cron_jobs['repository_archive_cache_worker']['job_class'] = 'Repository Settings.cron_jobs['import_export_project_cleanup_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['import_export_project_cleanup_worker']['cron'] ||= '0 * * * *' Settings.cron_jobs['import_export_project_cleanup_worker']['job_class'] = 'ImportExportProjectCleanupWorker' -Settings.cron_jobs['rescue_stale_live_trace_worker'] ||= Settingslogic.new({}) -Settings.cron_jobs['rescue_stale_live_trace_worker']['cron'] ||= '17 * * * *' -Settings.cron_jobs['rescue_stale_live_trace_worker']['job_class'] = 'RescueStaleLiveTraceWorker' +Settings.cron_jobs['ci_rescue_stale_live_trace_worker'] ||= Settingslogic.new({}) +Settings.cron_jobs['ci_rescue_stale_live_trace_worker']['cron'] ||= '17 * * * *' +Settings.cron_jobs['ci_rescue_stale_live_trace_worker']['job_class'] = 'RescueStaleLiveTraceWorker' Settings.cron_jobs['requests_profiles_worker'] ||= Settingslogic.new({}) Settings.cron_jobs['requests_profiles_worker']['cron'] ||= '0 0 * * *' Settings.cron_jobs['requests_profiles_worker']['job_class'] = 'RequestsProfilesWorker' |