IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-29 04:03:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Keep by_users check in S3 inventory

Browse Source 
Partial revert of 8515d8fa - the by_users check is ensuring we don't raise errors for fixtures
This commit is contained in:
David Taylor 2020-07-21 17:19:56 +01:00
parent ef37460c93
commit ec4024fe6d
No known key found for this signature in database
GPG Key ID: 46904C18B1D3F434
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/s3_inventory.rb
View File

@ -62,6 +62,8 @@ class S3Inventory
#{model.table_name}.url = #{table_name}.url") #{model.table_name}.url = #{table_name}.url")
uploads = model.where("updated_at < ?", inventory_date) uploads = model.where("updated_at < ?", inventory_date)
uploads = uploads.by_users if model == Upload
missing_uploads = uploads missing_uploads = uploads
.joins("LEFT JOIN #{table_name} ON #{table_name}.etag = #{model.table_name}.etag") .joins("LEFT JOIN #{table_name} ON #{table_name}.etag = #{model.table_name}.etag")
.where("#{table_name}.etag IS NULL") .where("#{table_name}.etag IS NULL")

6
spec/components/s3_inventory_spec.rb
View File

@ -67,7 +67,7 @@ describe "S3Inventory" do
upload = Fabricate(:upload, etag: "ETag", updated_at: 1.days.ago) upload = Fabricate(:upload, etag: "ETag", updated_at: 1.days.ago)
Fabricate(:upload, etag: "ETag2", updated_at: Time.now) Fabricate(:upload, etag: "ETag2", updated_at: Time.now)
Fabricate(:upload, updated_at: 2.days.ago) no_etag = Fabricate(:upload, updated_at: 2.days.ago)
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(3) inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(3)
inventory.expects(:inventory_date).returns(Time.now) inventory.expects(:inventory_date).returns(Time.now)
@ -76,8 +76,8 @@ describe "S3Inventory" do
inventory.backfill_etags_and_list_missing inventory.backfill_etags_and_list_missing
end end
expect(output).to eq("#{upload.url}\n1 of 5 uploads are missing\n") expect(output).to eq("#{upload.url}\n#{no_etag.url}\n2 of 5 uploads are missing\n")
expect(Discourse.stats.get("missing_s3_uploads")).to eq(1) expect(Discourse.stats.get("missing_s3_uploads")).to eq(2)
end end
it "should backfill etags to uploads table correctly" do it "should backfill etags to uploads table correctly" do