diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2018-11-29 14:34:14 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2018-11-29 14:35:00 +0900 |
| commit | 3fbd48e127053517e9ee0f6307989758a4d59f9a (patch) | |
| tree | 78a93bf5c8294368f52ea834116d0a5b83e658fc /app/workers | |
| parent | a5f4627857bddc7e431d0fca6f17560e4b07e0b9 (diff) | |
| download | gitlab-ce-3fbd48e127053517e9ee0f6307989758a4d59f9a.tar.gz | |
Squashed commit of the following:
commit 10456b1e9240886432f565dd17689080bbb133b9
Merge: 312c1a9bdf8 a5f4627857b
Author: Shinya Maeda <shinya@gitlab.com>
Date: Thu Nov 29 14:33:21 2018 +0900
Merge branch 'master-ce' into add-counter-for-trace-chunks
commit 312c1a9bdf8efc45c3fed5ff50f05cc589bbb4ed
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Nov 28 20:06:18 2018 +0900
Fix coding offence
commit e397cc2ccc1b2cf7f8b3558b8fa81fe2aa0ab366
Author: Shinya Maeda <shinya@gitlab.com>
Date: Wed Nov 28 14:40:24 2018 +0900
Fix tracking archive failure
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/archive_trace_worker.rb | 2 | ||||
| -rw-r--r-- | app/workers/ci/archive_traces_cron_worker.rb | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/app/workers/archive_trace_worker.rb b/app/workers/archive_trace_worker.rb index c1283e9b2fc..4a9becf0ca7 100644 --- a/app/workers/archive_trace_worker.rb +++ b/app/workers/archive_trace_worker.rb @@ -7,7 +7,7 @@ class ArchiveTraceWorker # rubocop: disable CodeReuse/ActiveRecord def perform(job_id) Ci::Build.without_archived_trace.find_by(id: job_id).try do |job| - job.trace.archive! + Ci::ArchiveTraceService.new.execute(job) end end # rubocop: enable CodeReuse/ActiveRecord diff --git a/app/workers/ci/archive_traces_cron_worker.rb b/app/workers/ci/archive_traces_cron_worker.rb index 7443aad1380..f65ff239866 100644 --- a/app/workers/ci/archive_traces_cron_worker.rb +++ b/app/workers/ci/archive_traces_cron_worker.rb @@ -11,21 +11,9 @@ module Ci # This could happen when ArchiveTraceWorker sidekiq jobs were lost by receiving SIGKILL # More details in https://gitlab.com/gitlab-org/gitlab-ce/issues/36791 Ci::Build.finished.with_live_trace.find_each(batch_size: 100) do |build| - begin - build.trace.archive! - rescue ::Gitlab::Ci::Trace::AlreadyArchivedError - rescue => e - failed_archive_counter.increment - Rails.logger.error "Failed to archive stale live trace. id: #{build.id} message: #{e.message}" - end + Ci::ArchiveTraceService.new.execute(build) end end # rubocop: enable CodeReuse/ActiveRecord - - private - - def failed_archive_counter - @failed_archive_counter ||= Gitlab::Metrics.counter(:job_trace_archive_failed_total, "Counter of failed attempts of traces archiving") - end end end |