uploads: mark uploads as failed if they're stuck processing for more than 4 hours.

This commit is contained in:
evazion
2022-11-20 23:34:18 -06:00
parent 570d6a9d01
commit ba1cf14c7e
6 changed files with 47 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
# frozen_string_literal: true
# A job that runs hourly to mark as failed all uploads that got stuck in the 'processing' state for more than 4 hours.
# Spawned by {DanbooruMaintenance}.
class PruneUploadsJob < ApplicationJob
def perform
MediaAsset.prune!
UploadMediaAsset.prune!
Upload.prune!
end
end

View File

@@ -7,6 +7,7 @@ module DanbooruMaintenance
queue PrunePostsJob
queue PruneRateLimitsJob
queue RegeneratePostCountsJob
queue PruneUploadsJob
#queue AmcheckDatabaseJob
end

View File

@@ -51,6 +51,12 @@ class MediaAsset < ApplicationRecord
before_create :initialize_file_key
scope :expired, -> { processing.where(created_at: ..4.hours.ago) }
def self.prune!
expired.update_all(status: :failed)
end
class Variant
extend Memoist
include ActiveModel::Serializers::JSON

View File

@@ -24,6 +24,7 @@ class Upload < ApplicationRecord
validates :source, format: { with: %r{\Ahttps?://}i, message: "is not a valid URL" }, if: -> { source.present? }
validates :referer_url, format: { with: %r{\Ahttps?://}i, message: "is not a valid URL" }, if: -> { referer_url.present? }
validates :status, inclusion: { in: %w[pending processing completed error] }
validate :validate_file_and_source, on: :create
validate :validate_archive_files, on: :create
validate :validate_uploader_is_not_limited, on: :create
@@ -31,8 +32,10 @@ class Upload < ApplicationRecord
after_create :async_process_upload!
scope :pending, -> { where(status: "pending") }
scope :processing, -> { where(status: "processing") }
scope :completed, -> { where(status: "completed") }
scope :failed, -> { where(status: "error") }
scope :expired, -> { processing.where(created_at: ..4.hours.ago) }
def self.visible(user)
if user.is_admin?
@@ -42,6 +45,10 @@ class Upload < ApplicationRecord
end
end
def self.prune!
expired.update_all(status: "error", error: "Stuck processing for more than 4 hours")
end
concerning :StatusMethods do
def is_pending?
status == "pending"

View File

@@ -25,6 +25,7 @@ class UploadMediaAsset < ApplicationRecord
scope :unfinished, -> { where(status: %w[pending processing]) }
scope :finished, -> { where(status: %w[active failed]) }
scope :expired, -> { unfinished.where(created_at: ..4.hours.ago) }
def self.visible(user)
if user.is_admin?
@@ -36,6 +37,10 @@ class UploadMediaAsset < ApplicationRecord
end
end
def self.prune!
expired.update_all(status: :failed, error: "Stuck processing for more than 4 hours")
end
def self.search(params, current_user)
q = search_attributes(params, [:id, :created_at, :updated_at, :status, :source_url, :page_url, :error, :upload, :media_asset, :post], current_user: current_user)

View File

@@ -0,0 +1,17 @@
require 'test_helper'
class PruneUploadsJobTest < ActiveJob::TestCase
context "PruneUploadsJob" do
should "prune expired uploads and media assets" do
upload = create(:upload, created_at: 6.hours.ago, status: "processing")
media_asset = create(:media_asset, created_at: 6.hours.ago, status: "processing")
upload_media_asset = create(:upload_media_asset, created_at: 6.hours.ago, media_asset: media_asset, upload: upload, status: "processing")
PruneUploadsJob.perform_now
assert_equal("error", upload.reload.status)
assert_equal("failed", upload_media_asset.reload.status)
assert_equal("failed", media_asset.reload.status)
end
end
end