github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-22 13:41:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: run the rake task only for uploads created before a day from inventory date

Browse Source
This commit is contained in:
Vinoth Kannan 2019-02-14 17:53:08 +05:30
parent fc14847c14
commit b5fbd7385f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/s3_inventory.rb
View File

@ -5,7 +5,7 @@ require "csv"
class S3Inventory
attr_reader :inventory_id, :model, :last_modified
attr_reader :inventory_id, :model, :inventory_date
CSV_KEY_INDEX ||= 1
CSV_ETAG_INDEX ||= 2
@ -53,7 +53,7 @@ class S3Inventory
end
end
uploads = (model == Upload) ? model.where("created_at < ?", last_modified) : model
uploads = (model == Upload) ? model.where("created_at < ?", inventory_date) : model
missing_uploads = uploads.joins("LEFT JOIN #{table_name} ON #{table_name}.etag = #{model.table_name}.etag").where("#{table_name}.etag is NULL")
if (missing_count = missing_uploads.count) > 0
@ -129,7 +129,7 @@ class S3Inventory
symlink_file = unsorted_files.sort_by { |file| -file.last_modified.to_i }.first
return [] if symlink_file.blank?
@last_modified = symlink_file.last_modified
@inventory_date = symlink_file.last_modified - 1.day
log "Downloading symlink file to tmp directory..."
failure_message = "Failed to download symlink file to tmp directory."
filename = File.join(tmp_directory, File.basename(symlink_file.key))

6
spec/components/s3_inventory_spec.rb
View File

@ -66,8 +66,8 @@ describe "S3Inventory" do
inventory.expects(:download_inventory_files_to_tmp_directory)
inventory.expects(:decompress_inventory_files)
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).at_least(1)
inventory.expects(:last_modified).returns(Time.now)
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(2)
inventory.expects(:inventory_date).returns(Time.now)
output = capture_stdout do
inventory.list_missing
@ -81,7 +81,7 @@ describe "S3Inventory" do
inventory.expects(:download_inventory_files_to_tmp_directory)
inventory.expects(:decompress_inventory_files)
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).at_least(1)
inventory.expects(:files).returns([{ key: "Key", filename: "#{csv_filename}.gz" }]).times(2)
output = capture_stdout do
expect { inventory.list_missing(backfill_etags: true) }.to change { Upload.where(etag: nil).count }.by(-1)