diff options
-rw-r--r-- | app/models/ci/job_artifact.rb | 5 | ||||
-rw-r--r-- | app/uploaders/gitlab_uploader.rb | 8 | ||||
-rw-r--r-- | app/uploaders/job_artifact_uploader.rb | 12 | ||||
-rw-r--r-- | app/workers/all_queues.yml | 2 | ||||
-rw-r--r-- | app/workers/concerns/object_storage_queue.rb | 8 | ||||
-rw-r--r-- | app/workers/update_artifact_checksum_worker.rb | 11 | ||||
-rw-r--r-- | db/post_migrate/20180228121020_update_checksum_for_ci_job_artifacts.rb | 25 | ||||
-rw-r--r-- | spec/workers/concerns/object_storage_queue_spec.rb | 19 |
8 files changed, 0 insertions, 90 deletions
diff --git a/app/models/ci/job_artifact.rb b/app/models/ci/job_artifact.rb index a06a4bc502e..0a599f72bc7 100644 --- a/app/models/ci/job_artifact.rb +++ b/app/models/ci/job_artifact.rb @@ -6,7 +6,6 @@ module Ci belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id before_save :set_size, if: :file_changed? - before_save :set_checksum, if: :file_changed? mount_uploader :file, JobArtifactUploader @@ -26,10 +25,6 @@ module Ci self.size = file.size end - def set_checksum - self.checksum = file.checksum - end - def expire_in expire_at - Time.now if expire_at end diff --git a/app/uploaders/gitlab_uploader.rb b/app/uploaders/gitlab_uploader.rb index 9f693269808..010100f2da1 100644 --- a/app/uploaders/gitlab_uploader.rb +++ b/app/uploaders/gitlab_uploader.rb @@ -71,14 +71,6 @@ class GitlabUploader < CarrierWave::Uploader::Base !!model end - ## - # ObjectStorage::Concern extends this method for remote files - def use_file - if file_storage? - return yield path - end - end - private # Designed to be overridden by child uploaders that have a dynamic path diff --git a/app/uploaders/job_artifact_uploader.rb b/app/uploaders/job_artifact_uploader.rb index f994b89dd00..ad5385f45a4 100644 --- a/app/uploaders/job_artifact_uploader.rb +++ b/app/uploaders/job_artifact_uploader.rb @@ -9,12 +9,6 @@ class JobArtifactUploader < GitlabUploader model.size end - def checksum - return calc_checksum if model.checksum.nil? - - model.checksum - end - def store_dir dynamic_segment end @@ -27,12 +21,6 @@ class JobArtifactUploader < GitlabUploader private - def calc_checksum - use_file do |file_path| - return Digest::SHA256.file(file_path).hexdigest - end - end - def dynamic_segment creation_date = model.created_at.utc.strftime('%Y_%m_%d') diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index e47a8ca3985..328db19be29 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -104,5 +104,3 @@ - update_user_activity - upload_checksum - web_hook - -- object_storage:update_artifact_checksum_worker
\ No newline at end of file diff --git a/app/workers/concerns/object_storage_queue.rb b/app/workers/concerns/object_storage_queue.rb deleted file mode 100644 index a80f473a6d4..00000000000 --- a/app/workers/concerns/object_storage_queue.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Concern for setting Sidekiq settings for the various GitLab ObjectStorage workers. -module ObjectStorageQueue - extend ActiveSupport::Concern - - included do - queue_namespace :object_storage - end -end diff --git a/app/workers/update_artifact_checksum_worker.rb b/app/workers/update_artifact_checksum_worker.rb deleted file mode 100644 index a83fad04b95..00000000000 --- a/app/workers/update_artifact_checksum_worker.rb +++ /dev/null @@ -1,11 +0,0 @@ -class UpdateArtifactChecksumWorker - include ApplicationWorker - include ObjectStorageQueue - - def perform(job_artifact_id) - Ci::JobArtifact.find_by(id: job_artifact_id).try do |job_artifact| - job_artifact.set_checksum - job_artifact.save! - end - end -end diff --git a/db/post_migrate/20180228121020_update_checksum_for_ci_job_artifacts.rb b/db/post_migrate/20180228121020_update_checksum_for_ci_job_artifacts.rb deleted file mode 100644 index bf69c647b4d..00000000000 --- a/db/post_migrate/20180228121020_update_checksum_for_ci_job_artifacts.rb +++ /dev/null @@ -1,25 +0,0 @@ -class UpdateChecksumForCiJobArtifacts < ActiveRecord::Migration - include Gitlab::Database::MigrationHelpers - - DOWNTIME = false - BATCH_SIZE = 2500 - - class JobArtifact < ActiveRecord::Base - include EachBatch - self.table_name = 'ci_job_artifacts' - end - - def up - UpdateChecksumForCiJobArtifacts::JobArtifact - .where('checksum IS NULL') - .each_batch(of: BATCH_SIZE) do |relation| - ids = relation.pluck(:id).map { |id| [id] } - - UpdateArtifactChecksumWorker.bulk_perform_async(ids) - end - end - - def down - # no-op - end -end diff --git a/spec/workers/concerns/object_storage_queue_spec.rb b/spec/workers/concerns/object_storage_queue_spec.rb deleted file mode 100644 index f725fc9a4b1..00000000000 --- a/spec/workers/concerns/object_storage_queue_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' - -describe ObjectStorageQueue do - let(:worker) do - Class.new do - def self.name - 'DummyWorker' - end - - include ApplicationWorker - include ObjectStorageQueue - end - end - - it 'sets a default object storage queue automatically' do - expect(worker.sidekiq_options['queue']) - .to eq 'object_storage:dummy' - end -end |