4e17f6b9-026c-48fa-b8a5-2344ed135dfa

Committed 30 Jan 2025 07:00PM UTC coverage: 83.46% (-0.05%) from 83.508%

Build # 4e17f6b9-026c-48fa-b8a5-2344ed135dfa

Build Type

Pull #1266

circleci

Committed by

hectorcorrea

Commit Message

Handle the case when the job update request because the job took too long

Pull Request Pull Request #1266: Handle SQL UPDATE errors on long running jobs

Run Details

4 of 4 branches covered (100.0%)

6 of 8 new or added lines in 1 file covered. (75.0%)

2311 of 2769 relevant lines covered (83.46%)

382.68 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

88.89

/app/jobs/file_inventory_job.rb

# frozen_string_literal: true
class FileInventoryJob < ApplicationJob
  # Create the FileInventoryRequest as soon as the job is created, not when it is performed
  before_enqueue do |job|
    project = Project.find(job.arguments.first[:project_id])
    FileInventoryRequest.create(user_id: job.arguments.first[:user_id], project_id: job.arguments.first[:project_id], job_id: @job_id, state: UserRequest::PENDING,
                                request_details: { project_title: project.title })
  end

  # This is required because the before_enqueue does not get called when perform_now is run on a job
  # We include both before_perform and before_enqueue so perform_now and perform_later will work as desired
  before_perform do |job|
    project = Project.find(job.arguments.first[:project_id])
    inventory_request = FileInventoryRequest.find_by(user_id: job.arguments.first[:user_id], project_id: job.arguments.first[:project_id], job_id: @job_id)
    if inventory_request.blank?
      FileInventoryRequest.create(user_id: job.arguments.first[:user_id], project_id: job.arguments.first[:project_id], job_id: @job_id, state: UserRequest::PENDING,
                                  request_details: { project_title: project.title })
    end
  end

  def perform(user_id:, project_id:, mediaflux_session:)
    project = Project.find(project_id)
    raise "Invalid project id #{project_id} for job #{job_id}" if project.nil?
    user = User.find(user_id)
    raise "Invalid user id #{user_id} for job #{job_id}" if user.nil?
    Rails.logger.debug inspect

    # set the mediaflux session to the one the user created, do not just utilize the system one
    user.mediaflux_from_session({ mediaflux_session: })

    # Queries Mediaflux for the file list and saves it to a CSV file.
    filename = filename_for_export
    Rails.logger.info "Exporting file list to #{filename} for project #{project_id}"
    project.file_list_to_file(session_id: mediaflux_session, filename: filename)
    Rails.logger.info "Export file generated #{filename} for project #{project_id}"

    # Update the job record as completed
    update_inventory_request(user_id: user.id, project: project, job_id: @job_id, filename: filename)
  end

  private

    def mediaflux_session
      logon_request = Mediaflux::LogonRequest.new
      logon_request.session_token
    end

    def filename_for_export
      raise "Shared location is not configured" if Rails.configuration.mediaflux["shared_files_location"].blank?
      pathname = Pathname.new(Rails.configuration.mediaflux["shared_files_location"])
      pathname.join("#{job_id}.csv").to_s
    end

    def update_inventory_request(user_id:, project:, job_id:, filename: )
      inventory_request = FileInventoryRequest.find_by(user_id: user_id, project_id: project.id, job_id: job_id)
      request_details = { output_file: filename, project_title: project.title, file_size: File.size(filename) }
      inventory_request.update(state: UserRequest::COMPLETED, request_details: request_details,
                                completion_time: Time.current.in_time_zone("America/New_York"))
      inventory_request
    rescue ActiveRecord::StatementInvalid
      ActiveRecord::Base.connection_pool.release_connection
      retry
    end
end

1	# frozen_string_literal: true
2	class FileInventoryJob < ApplicationJob	1✔
3	# Create the FileInventoryRequest as soon as the job is created, not when it is performed
4	before_enqueue do \|job\|	1✔
5	project = Project.find(job.arguments.first[:project_id])	2✔
6	FileInventoryRequest.create(user_id: job.arguments.first[:user_id], project_id: job.arguments.first[:project_id], job_id: @job_id, state: UserRequest::PENDING,	2✔
7	request_details: { project_title: project.title })
8	end
9
10	# This is required because the before_enqueue does not get called when perform_now is run on a job
11	# We include both before_perform and before_enqueue so perform_now and perform_later will work as desired
12	before_perform do \|job\|	1✔
13	project = Project.find(job.arguments.first[:project_id])	11✔
14	inventory_request = FileInventoryRequest.find_by(user_id: job.arguments.first[:user_id], project_id: job.arguments.first[:project_id], job_id: @job_id)	11✔
15	if inventory_request.blank?	11✔
16	FileInventoryRequest.create(user_id: job.arguments.first[:user_id], project_id: job.arguments.first[:project_id], job_id: @job_id, state: UserRequest::PENDING,	10✔
17	request_details: { project_title: project.title })
18	end
19	end
20
21	def perform(user_id:, project_id:, mediaflux_session:)	1✔
22	project = Project.find(project_id)	11✔
23	raise "Invalid project id #{project_id} for job #{job_id}" if project.nil?	11✔
24	user = User.find(user_id)	11✔
25	raise "Invalid user id #{user_id} for job #{job_id}" if user.nil?	10✔
26	Rails.logger.debug inspect	10✔
27
28	# set the mediaflux session to the one the user created, do not just utilize the system one
29	user.mediaflux_from_session({ mediaflux_session: })	10✔
30
31	# Queries Mediaflux for the file list and saves it to a CSV file.
32	filename = filename_for_export	10✔
33	Rails.logger.info "Exporting file list to #{filename} for project #{project_id}"	10✔
34	project.file_list_to_file(session_id: mediaflux_session, filename: filename)	10✔
35	Rails.logger.info "Export file generated #{filename} for project #{project_id}"	10✔
36
37	# Update the job record as completed
38	update_inventory_request(user_id: user.id, project: project, job_id: @job_id, filename: filename)	10✔
39	end
40
41	private	1✔
42
43	def mediaflux_session	1✔
44	logon_request = Mediaflux::LogonRequest.new	×
45	logon_request.session_token	×
46	end
47
48	def filename_for_export	1✔
49	raise "Shared location is not configured" if Rails.configuration.mediaflux["shared_files_location"].blank?	10✔
50	pathname = Pathname.new(Rails.configuration.mediaflux["shared_files_location"])	10✔
51	pathname.join("#{job_id}.csv").to_s	10✔
52	end
53
54	def update_inventory_request(user_id:, project:, job_id:, filename: )	1✔
55	inventory_request = FileInventoryRequest.find_by(user_id: user_id, project_id: project.id, job_id: job_id)	10✔
56	request_details = { output_file: filename, project_title: project.title, file_size: File.size(filename) }	10✔
57	inventory_request.update(state: UserRequest::COMPLETED, request_details: request_details,	10✔
58	completion_time: Time.current.in_time_zone("America/New_York"))
59	inventory_request	10✔
60	rescue ActiveRecord::StatementInvalid
NEW 61	ActiveRecord::Base.connection_pool.release_connection	×
NEW 62	retry	×
63	end
64	end

pulibrary / tigerdata-app / 4e17f6b9-026c-48fa-b8a5-2344ed135dfa

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous