mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 08:57:10 -06:00
FIX: Improve S3 inventory logic
Previously we considered 'upload rows without etags' to be exempt from the check. This is bad, because older/migrated sites might not have etags on all their uploads. We should consider rows without etags to be broken, since we can't check them against the inventory. This also removes the `by_users` scope. We need all uploads to be working, even ones created by the system user.
This commit is contained in:
parent
74ddbc91b0
commit
8515d8fae5
@ -61,10 +61,10 @@ class S3Inventory
|
||||
WHERE #{model.table_name}.etag IS NULL AND
|
||||
#{model.table_name}.url = #{table_name}.url")
|
||||
|
||||
uploads = model.by_users.where("updated_at < ?", inventory_date)
|
||||
uploads = model.where("updated_at < ?", inventory_date)
|
||||
missing_uploads = uploads
|
||||
.joins("LEFT JOIN #{table_name} ON #{table_name}.etag = #{model.table_name}.etag")
|
||||
.where("#{table_name}.etag IS NULL AND #{model.table_name}.etag IS NOT NULL")
|
||||
.where("#{table_name}.etag IS NULL")
|
||||
|
||||
if (missing_count = missing_uploads.count) > 0
|
||||
missing_uploads.select(:id, :url).find_each do |upload|
|
||||
|
Loading…
Reference in New Issue
Block a user