diff options
author | Andreas Brandl <abrandl@gitlab.com> | 2018-11-07 15:27:13 +0300 |
---|---|---|
committer | Andreas Brandl <abrandl@gitlab.com> | 2018-11-07 15:27:13 +0300 |
commit | 2508d7b32ecc965df3009ec5f0472c0c9693697b (patch) | |
tree | cd4c20fbecb8682b5a78bc20106191ac8038197e /app/models | |
parent | a82a595728d54bdc12e51dfcfb22e9eddc449143 (diff) | |
parent | 16116bb148a7582ad39e026459b9fb7572b8936f (diff) |
Merge branch 'tc-index-uploads-file-store' into 'master'
Enhance performance of counting local Uploads
Closes gitlab-ee#6070
See merge request gitlab-org/gitlab-ce!22522
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/upload.rb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/app/models/upload.rb b/app/models/upload.rb index 23bc9ca42fc..e01e9c6a4f0 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -11,7 +11,8 @@ class Upload < ActiveRecord::Base validates :model, presence: true validates :uploader, presence: true - scope :with_files_stored_locally, -> { where(store: [nil, ObjectStorage::Store::LOCAL]) } + scope :with_files_stored_locally, -> { where(store: ObjectStorage::Store::LOCAL) } + scope :with_files_stored_remotely, -> { where(store: ObjectStorage::Store::REMOTE) } before_save :calculate_checksum!, if: :foreground_checksummable? after_commit :schedule_checksum, if: :checksummable? @@ -46,7 +47,18 @@ class Upload < ActiveRecord::Base end def exist? - File.exist?(absolute_path) + exist = File.exist?(absolute_path) + + # Help sysadmins find missing upload files + if persisted? && !exist + if Gitlab::Sentry.enabled? + Raven.capture_message("Upload file does not exist", extra: self.attributes) + end + + Gitlab::Metrics.counter(:upload_file_does_not_exist_total, 'The number of times an upload record could not find its file').increment + end + + exist end def uploader_context @@ -57,8 +69,6 @@ class Upload < ActiveRecord::Base end def local? - return true if store.nil? - store == ObjectStorage::Store::LOCAL end |