summaryrefslogtreecommitdiff
path: root/lib/tasks
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-02-28 18:43:19 +0900
committerShinya Maeda <shinya@gitlab.com>2018-03-06 21:43:19 +0900
commit824af79d64b8be277dbddad0936c2b7b8237ce5d (patch)
tree23fdd97074bfb8fa6491f0dc0fc7f16402dc8b0e /lib/tasks
parent91117452e1c106352171aea56ef336dbafd322a6 (diff)
downloadgitlab-ce-824af79d64b8be277dbddad0936c2b7b8237ce5d.tar.gz
Fix rake task to use corrrect SQL
Diffstat (limited to 'lib/tasks')
-rw-r--r--lib/tasks/gitlab/traces.rake9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/tasks/gitlab/traces.rake b/lib/tasks/gitlab/traces.rake
index 04b939d23c9..46e2f0e523c 100644
--- a/lib/tasks/gitlab/traces.rake
+++ b/lib/tasks/gitlab/traces.rake
@@ -8,17 +8,16 @@ namespace :gitlab do
logger = Logger.new(STDOUT)
logger.info('Archiving legacy traces')
- Ci::Build.joins('RIGHT JOIN ci_job_artifacts ON ci_job_artifacts.job_id = ci_builds.id')
- .finished
- .where('ci_job_artifacts.file_type <> 3')
- .group('ci_builds.id')
+ Ci::Build.finished
+ .where('NOT EXISTS (?)',
+ Ci::JobArtifact.select(1).trace.where('ci_builds.id = ci_job_artifacts.job_id'))
.order(id: :asc)
.find_in_batches(batch_size: 1000) do |jobs|
job_ids = jobs.map { |job| [job.id] }
ArchiveLegacyTraceWorker.bulk_perform_async(job_ids)
- logger.info("Scheduled #{job_ids.count} jobs. From #{job_ids.min} #{job_ids.max}")
+ logger.info("Scheduled #{job_ids.count} jobs. From #{job_ids.min} to #{job_ids.max}")
end
end
end