mission_control-jobs 0.1.0 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +20 -18
- data/app/controllers/concerns/mission_control/jobs/adapter_features.rb +10 -6
- data/app/controllers/concerns/mission_control/jobs/failed_jobs_bulk_operations.rb +1 -1
- data/app/controllers/concerns/mission_control/jobs/job_scoped.rb +1 -1
- data/app/controllers/concerns/mission_control/jobs/not_found_redirections.rb +9 -1
- data/app/controllers/concerns/mission_control/jobs/queue_scoped.rb +1 -1
- data/app/controllers/mission_control/jobs/bulk_discards_controller.rb +1 -1
- data/app/controllers/mission_control/jobs/discards_controller.rb +1 -1
- data/app/controllers/mission_control/jobs/dispatches_controller.rb +13 -0
- data/app/controllers/mission_control/jobs/jobs_controller.rb +5 -3
- data/app/controllers/mission_control/jobs/queues_controller.rb +4 -4
- data/app/controllers/mission_control/jobs/recurring_tasks_controller.rb +23 -0
- data/app/controllers/mission_control/jobs/retries_controller.rb +1 -1
- data/app/controllers/mission_control/jobs/workers_controller.rb +6 -1
- data/app/helpers/mission_control/jobs/jobs_helper.rb +6 -2
- data/app/helpers/mission_control/jobs/navigation_helper.rb +2 -1
- data/app/models/mission_control/jobs/page.rb +8 -8
- data/app/models/mission_control/jobs/recurring_task.rb +17 -0
- data/app/views/layouts/mission_control/jobs/_application_selection.html.erb +1 -1
- data/app/views/mission_control/jobs/jobs/_error_information.html.erb +0 -1
- data/app/views/mission_control/jobs/jobs/_general_information.html.erb +1 -1
- data/app/views/mission_control/jobs/jobs/_jobs_page.html.erb +8 -10
- data/app/views/mission_control/jobs/jobs/_title.html.erb +3 -0
- data/app/views/mission_control/jobs/jobs/blocked/_actions.html.erb +3 -0
- data/app/views/mission_control/jobs/jobs/blocked/_job.html.erb +3 -0
- data/app/views/mission_control/jobs/jobs/index.html.erb +2 -2
- data/app/views/mission_control/jobs/jobs/scheduled/_actions.html.erb +4 -0
- data/app/views/mission_control/jobs/jobs/scheduled/_job.html.erb +4 -1
- data/app/views/mission_control/jobs/queues/_queue_title.html.erb +1 -1
- data/app/views/mission_control/jobs/queues/show.html.erb +2 -2
- data/app/views/mission_control/jobs/recurring_tasks/_general_information.html.erb +16 -0
- data/app/views/mission_control/jobs/recurring_tasks/_recurring_task.html.erb +14 -0
- data/app/views/mission_control/jobs/recurring_tasks/_title.html.erb +7 -0
- data/app/views/mission_control/jobs/recurring_tasks/index.html.erb +16 -0
- data/app/views/mission_control/jobs/recurring_tasks/show.html.erb +14 -0
- data/app/views/mission_control/jobs/{workers → shared}/_job.html.erb +8 -1
- data/app/views/mission_control/jobs/shared/_jobs.html.erb +14 -0
- data/app/views/mission_control/jobs/shared/_pagination_toolbar.html.erb +3 -3
- data/app/views/mission_control/jobs/workers/_workers_page.html.erb +15 -0
- data/app/views/mission_control/jobs/workers/index.html.erb +2 -13
- data/app/views/mission_control/jobs/workers/show.html.erb +9 -2
- data/config/routes.rb +2 -2
- data/lib/active_job/executing.rb +3 -6
- data/lib/active_job/failed.rb +0 -4
- data/lib/active_job/job_proxy.rb +6 -0
- data/lib/active_job/jobs_relation.rb +17 -6
- data/lib/active_job/queue_adapters/resque_ext.rb +1 -1
- data/lib/active_job/queue_adapters/solid_queue_ext/recurring_tasks.rb +43 -0
- data/lib/active_job/queue_adapters/solid_queue_ext/workers.rb +41 -0
- data/lib/active_job/queue_adapters/solid_queue_ext.rb +51 -55
- data/lib/mission_control/jobs/adapter.rb +67 -19
- data/lib/mission_control/jobs/console/helpers.rb +1 -1
- data/lib/mission_control/jobs/engine.rb +13 -3
- data/lib/mission_control/jobs/server/recurring_tasks.rb +15 -0
- data/lib/mission_control/jobs/server/serializable.rb +1 -1
- data/lib/mission_control/jobs/server/workers.rb +3 -5
- data/lib/mission_control/jobs/server.rb +1 -1
- data/lib/mission_control/jobs/version.rb +1 -1
- data/lib/mission_control/jobs/workers_relation.rb +78 -0
- data/lib/mission_control/jobs.rb +3 -0
- metadata +19 -6
- data/app/jobs/mission_control/jobs/application_job.rb +0 -6
- data/app/mailers/mission_control/jobs/application_mailer.rb +0 -8
- data/app/views/mission_control/jobs/workers/_jobs.html.erb +0 -20
@@ -0,0 +1,14 @@
|
|
1
|
+
<% navigation(title: @recurring_task.id, section: :recurring_tasks) %>
|
2
|
+
|
3
|
+
<%= render "mission_control/jobs/recurring_tasks/title", recurring_task: @recurring_task %>
|
4
|
+
<%= render "mission_control/jobs/recurring_tasks/general_information", recurring_task: @recurring_task %>
|
5
|
+
|
6
|
+
<% if @jobs_page.empty? %>
|
7
|
+
<%= blank_status_notice "No jobs found for this recurring task" %>
|
8
|
+
<% else %>
|
9
|
+
<h2 class="subtitle"><%= pluralize @recurring_task.jobs.count, "job" %></h2>
|
10
|
+
|
11
|
+
<%= render "mission_control/jobs/shared/jobs", jobs: @jobs_page.records %>
|
12
|
+
|
13
|
+
<%= render "mission_control/jobs/shared/pagination_toolbar", page: @jobs_page, filter_param: jobs_filter_param %>
|
14
|
+
<% end %>
|
@@ -14,6 +14,13 @@
|
|
14
14
|
</td>
|
15
15
|
|
16
16
|
<td>
|
17
|
-
<div class="has-text-grey"
|
17
|
+
<div class="has-text-grey">
|
18
|
+
<% if job.started_at %>
|
19
|
+
Running for <%= time_distance_in_words_with_title(job.started_at) %>
|
20
|
+
<% elsif job.finished_at %>
|
21
|
+
Finished <%= time_ago_in_words_with_title(job.finished_at) %> ago
|
22
|
+
<% else %>
|
23
|
+
Pending
|
24
|
+
<% end %>
|
18
25
|
</td>
|
19
26
|
</tr>
|
@@ -0,0 +1,14 @@
|
|
1
|
+
<table class="jobs table is-hoverable is-fullwidth">
|
2
|
+
<tbody>
|
3
|
+
<thead>
|
4
|
+
<tr>
|
5
|
+
<th style="width: 30%;">Job</th>
|
6
|
+
<th></th>
|
7
|
+
<th style="width: 20%;"></th>
|
8
|
+
</tr>
|
9
|
+
</thead>
|
10
|
+
|
11
|
+
<%= render partial: "mission_control/jobs/shared/job", collection: jobs %>
|
12
|
+
|
13
|
+
</tbody>
|
14
|
+
</table>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<nav class="buttons is-right" role="navigation" aria-label="pagination">
|
2
|
-
<span class="mr-3"><%=
|
3
|
-
<%= link_to "Previous page", url_for(page:
|
4
|
-
<%= link_to "Next page", url_for(page:
|
2
|
+
<span class="mr-3"><%= page.index %> / <%= page.pages_count || "..." %></span>
|
3
|
+
<%= link_to "Previous page", url_for(page: page.previous_index, **filter_param), class: "pagination-previous", disabled: page.first? %>
|
4
|
+
<%= link_to "Next page", url_for(page: page.next_index, **filter_param), class: "pagination-next", disabled: page.last? %>
|
5
5
|
</nav>
|
@@ -0,0 +1,15 @@
|
|
1
|
+
<table class="workers table jobs is-hoverable is-fullwidth">
|
2
|
+
<tbody>
|
3
|
+
<thead>
|
4
|
+
<tr>
|
5
|
+
<th>Worker</th>
|
6
|
+
<th>Hostname</th>
|
7
|
+
<th style="width: 35%;">Jobs</th>
|
8
|
+
<th>Last heartbeat</th>
|
9
|
+
</tr>
|
10
|
+
</thead>
|
11
|
+
|
12
|
+
<%= render partial: "mission_control/jobs/workers/worker", collection: workers_page.records %>
|
13
|
+
|
14
|
+
</tbody>
|
15
|
+
</table>
|
@@ -1,17 +1,6 @@
|
|
1
1
|
<% navigation(title: "Workers", section: :workers) %>
|
2
2
|
|
3
|
-
|
4
|
-
<tbody>
|
5
|
-
<thead>
|
6
|
-
<tr>
|
7
|
-
<th>Worker</th>
|
8
|
-
<th>Hostname</th>
|
9
|
-
<th style="width: 35%;">Jobs</th>
|
10
|
-
<th>Last heartbeat</th>
|
11
|
-
</tr>
|
12
|
-
</thead>
|
3
|
+
<%= render "mission_control/jobs/workers/workers_page", workers_page: @workers_page %>
|
13
4
|
|
14
|
-
|
5
|
+
<%= render "mission_control/jobs/shared/pagination_toolbar", page: @workers_page, filter_param: {} %>
|
15
6
|
|
16
|
-
</tbody>
|
17
|
-
</table>
|
@@ -2,6 +2,13 @@
|
|
2
2
|
|
3
3
|
<%= render "mission_control/jobs/workers/title", worker: @worker %>
|
4
4
|
<%= render "mission_control/jobs/workers/configuration", worker: @worker %>
|
5
|
-
<%= render "mission_control/jobs/workers/jobs", worker: @worker %>
|
6
|
-
<%= render "mission_control/jobs/workers/raw_data", worker: @worker %>
|
7
5
|
|
6
|
+
<% if @worker.jobs.empty? %>
|
7
|
+
<%= blank_status_notice "This worker is idle" %>
|
8
|
+
<% else %>
|
9
|
+
<h2 class="subtitle">Running <%= pluralize @worker.jobs.size, "job" %></h2>
|
10
|
+
|
11
|
+
<%= render "mission_control/jobs/shared/jobs", jobs: @worker.jobs %>
|
12
|
+
<% end %>
|
13
|
+
|
14
|
+
<%= render "mission_control/jobs/workers/raw_data", worker: @worker %>
|
data/config/routes.rb
CHANGED
@@ -9,6 +9,7 @@ MissionControl::Jobs::Engine.routes.draw do
|
|
9
9
|
resources :jobs, only: :show do
|
10
10
|
resource :retry, only: :create
|
11
11
|
resource :discard, only: :create
|
12
|
+
resource :dispatch, only: :create
|
12
13
|
|
13
14
|
collection do
|
14
15
|
resource :bulk_retries, only: :create
|
@@ -19,6 +20,7 @@ MissionControl::Jobs::Engine.routes.draw do
|
|
19
20
|
resources :jobs, only: :index, path: ":status/jobs"
|
20
21
|
|
21
22
|
resources :workers, only: [ :index, :show ]
|
23
|
+
resources :recurring_tasks, only: [ :index, :show ]
|
22
24
|
end
|
23
25
|
|
24
26
|
# Allow referencing urls without providing an application_id. It will default to the first one.
|
@@ -27,7 +29,5 @@ MissionControl::Jobs::Engine.routes.draw do
|
|
27
29
|
resources :jobs, only: :show
|
28
30
|
resources :jobs, only: :index, path: ":status/jobs"
|
29
31
|
|
30
|
-
resources :workers, only: [ :index, :show ]
|
31
|
-
|
32
32
|
root to: "queues#index"
|
33
33
|
end
|
data/lib/active_job/executing.rb
CHANGED
@@ -4,9 +4,8 @@ module ActiveJob::Executing
|
|
4
4
|
extend ActiveSupport::Concern
|
5
5
|
|
6
6
|
included do
|
7
|
-
attr_accessor :raw_data, :position, :finished_at, :blocked_by, :blocked_until, :worker_id, :started_at
|
7
|
+
attr_accessor :raw_data, :position, :finished_at, :blocked_by, :blocked_until, :worker_id, :started_at, :status
|
8
8
|
attr_reader :serialized_arguments
|
9
|
-
attr_writer :status
|
10
9
|
|
11
10
|
thread_cattr_accessor :current_queue_adapter
|
12
11
|
end
|
@@ -25,10 +24,8 @@ module ActiveJob::Executing
|
|
25
24
|
jobs_relation_for_discarding.discard_job(self)
|
26
25
|
end
|
27
26
|
|
28
|
-
def
|
29
|
-
|
30
|
-
|
31
|
-
failed? ? :failed : :pending
|
27
|
+
def dispatch
|
28
|
+
ActiveJob.jobs.blocked.dispatch_job(self)
|
32
29
|
end
|
33
30
|
|
34
31
|
private
|
data/lib/active_job/failed.rb
CHANGED
data/lib/active_job/job_proxy.rb
CHANGED
@@ -23,4 +23,10 @@ class ActiveJob::JobProxy < ActiveJob::Base
|
|
23
23
|
def perform_now
|
24
24
|
raise UnsupportedError, "A JobProxy doesn't support immediate execution, only enqueuing."
|
25
25
|
end
|
26
|
+
|
27
|
+
ActiveJob::JobsRelation::STATUSES.each do |status|
|
28
|
+
define_method "#{status}?" do
|
29
|
+
self.status == status
|
30
|
+
end
|
31
|
+
end
|
26
32
|
end
|
@@ -1,12 +1,12 @@
|
|
1
1
|
# A relation of jobs that can be filtered and acted on.
|
2
2
|
#
|
3
|
-
# Relations of jobs are normally fetched via +ActiveJob
|
3
|
+
# Relations of jobs are normally fetched via +ActiveJob.jobs+
|
4
4
|
# or through a given queue (+ActiveJob::Queue#jobs+).
|
5
5
|
#
|
6
6
|
# This class offers a fluid interface to query a subset of jobs. For
|
7
7
|
# example:
|
8
8
|
#
|
9
|
-
# queue = ActiveJob
|
9
|
+
# queue = ActiveJob.queues[:default]
|
10
10
|
# queue.jobs.limit(10).where(job_class_name: "DummyJob").last
|
11
11
|
#
|
12
12
|
# Relations are enumerable, so you can use +Enumerable+ methods on them.
|
@@ -25,7 +25,7 @@ class ActiveJob::JobsRelation
|
|
25
25
|
STATUSES = %i[ pending failed in_progress blocked scheduled finished ]
|
26
26
|
FILTERS = %i[ queue_name job_class_name ]
|
27
27
|
|
28
|
-
PROPERTIES = %i[ queue_name status offset_value limit_value job_class_name worker_id ]
|
28
|
+
PROPERTIES = %i[ queue_name status offset_value limit_value job_class_name worker_id recurring_task_id ]
|
29
29
|
attr_reader *PROPERTIES, :default_page_size
|
30
30
|
|
31
31
|
delegate :last, :[], :reverse, to: :to_a
|
@@ -50,9 +50,15 @@ class ActiveJob::JobsRelation
|
|
50
50
|
# for large sets of jobs.
|
51
51
|
# * <tt>:queue_name</tt> - To only include the jobs in the provided queue.
|
52
52
|
# * <tt>:worker_id</tt> - To only include the jobs processed by the provided worker.
|
53
|
-
|
53
|
+
# * <tt>:recurring_task_id</tt> - To only include the jobs corresponding to runs of a recurring task.
|
54
|
+
def where(job_class_name: nil, queue_name: nil, worker_id: nil, recurring_task_id: nil)
|
54
55
|
# Remove nil arguments to avoid overriding parameters when concatenating +where+ clauses
|
55
|
-
arguments = { job_class_name: job_class_name,
|
56
|
+
arguments = { job_class_name: job_class_name,
|
57
|
+
queue_name: queue_name,
|
58
|
+
worker_id: worker_id,
|
59
|
+
recurring_task_id: recurring_task_id
|
60
|
+
}.compact.collect { |key, value| [ key, value.to_s ] }.to_h
|
61
|
+
|
56
62
|
clone_with **arguments
|
57
63
|
end
|
58
64
|
|
@@ -147,6 +153,11 @@ class ActiveJob::JobsRelation
|
|
147
153
|
queue_adapter.discard_job(job, self)
|
148
154
|
end
|
149
155
|
|
156
|
+
# Dispatch the provided job.
|
157
|
+
def dispatch_job(job)
|
158
|
+
queue_adapter.dispatch_job(job, self)
|
159
|
+
end
|
160
|
+
|
150
161
|
# Find a job by id.
|
151
162
|
#
|
152
163
|
# Returns nil when not found.
|
@@ -258,7 +269,7 @@ class ActiveJob::JobsRelation
|
|
258
269
|
end
|
259
270
|
|
260
271
|
def filters
|
261
|
-
@filters ||= FILTERS.select { |property| public_send(property).present? && !queue_adapter.
|
272
|
+
@filters ||= FILTERS.select { |property| public_send(property).present? && !queue_adapter.supports_job_filter?(self, property) }
|
262
273
|
end
|
263
274
|
|
264
275
|
def ensure_failed_status
|
@@ -0,0 +1,43 @@
|
|
1
|
+
module ActiveJob::QueueAdapters::SolidQueueExt::RecurringTasks
|
2
|
+
def supports_recurring_tasks?
|
3
|
+
true
|
4
|
+
end
|
5
|
+
|
6
|
+
def recurring_tasks
|
7
|
+
tasks = recurring_tasks_from_dispatchers
|
8
|
+
last_enqueued_at_times = recurring_task_last_enqueued_at(tasks.keys)
|
9
|
+
|
10
|
+
recurring_tasks_from_dispatchers.collect do |task_id, task_attrs|
|
11
|
+
recurring_task_attributes_from_solid_queue_task_attributes(task_attrs).merge \
|
12
|
+
id: task_id,
|
13
|
+
last_enqueued_at: last_enqueued_at_times[task_id]
|
14
|
+
end
|
15
|
+
end
|
16
|
+
|
17
|
+
def find_recurring_task(task_id)
|
18
|
+
if task_attrs = recurring_tasks_from_dispatchers[task_id]
|
19
|
+
recurring_task_attributes_from_solid_queue_task_attributes(task_attrs).merge \
|
20
|
+
id: task_id,
|
21
|
+
last_enqueued_at: recurring_task_last_enqueued_at(task_id).values&.first
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
private
|
26
|
+
def recurring_tasks_from_dispatchers
|
27
|
+
SolidQueue::Process.where(kind: "Dispatcher").flat_map do |process|
|
28
|
+
process.metadata["recurring_schedule"]
|
29
|
+
end.compact.reduce({}, &:merge)
|
30
|
+
end
|
31
|
+
|
32
|
+
def recurring_task_attributes_from_solid_queue_task_attributes(task_attributes)
|
33
|
+
{
|
34
|
+
job_class_name: task_attributes["class_name"],
|
35
|
+
arguments: task_attributes["arguments"],
|
36
|
+
schedule: task_attributes["schedule"]
|
37
|
+
}
|
38
|
+
end
|
39
|
+
|
40
|
+
def recurring_task_last_enqueued_at(task_keys)
|
41
|
+
SolidQueue::RecurringExecution.where(task_key: task_keys).group(:task_key).maximum(:run_at)
|
42
|
+
end
|
43
|
+
end
|
@@ -0,0 +1,41 @@
|
|
1
|
+
module ActiveJob::QueueAdapters::SolidQueueExt::Workers
|
2
|
+
def exposes_workers?
|
3
|
+
true
|
4
|
+
end
|
5
|
+
|
6
|
+
def fetch_workers(workers_relation)
|
7
|
+
solid_queue_processes_from_workers_relation(workers_relation).collect do |process|
|
8
|
+
worker_from_solid_queue_process(process)
|
9
|
+
end
|
10
|
+
end
|
11
|
+
|
12
|
+
def count_workers(workers_relation)
|
13
|
+
solid_queue_processes_from_workers_relation(workers_relation).count
|
14
|
+
end
|
15
|
+
|
16
|
+
def find_worker(worker_id)
|
17
|
+
if process = SolidQueue::Process.find_by(id: worker_id)
|
18
|
+
worker_attributes_from_solid_queue_process(process)
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
private
|
23
|
+
def solid_queue_processes_from_workers_relation(relation)
|
24
|
+
SolidQueue::Process.where(kind: "Worker").offset(relation.offset_value).limit(relation.limit_value)
|
25
|
+
end
|
26
|
+
|
27
|
+
def worker_from_solid_queue_process(process)
|
28
|
+
MissionControl::Jobs::Worker.new(queue_adapter: self, **worker_attributes_from_solid_queue_process(process))
|
29
|
+
end
|
30
|
+
|
31
|
+
def worker_attributes_from_solid_queue_process(process)
|
32
|
+
{
|
33
|
+
id: process.id,
|
34
|
+
name: "PID: #{process.pid}",
|
35
|
+
hostname: process.hostname,
|
36
|
+
last_heartbeat_at: process.last_heartbeat_at,
|
37
|
+
configuration: process.metadata,
|
38
|
+
raw_data: process.as_json
|
39
|
+
}
|
40
|
+
end
|
41
|
+
end
|
@@ -1,5 +1,6 @@
|
|
1
1
|
module ActiveJob::QueueAdapters::SolidQueueExt
|
2
2
|
include MissionControl::Jobs::Adapter
|
3
|
+
include RecurringTasks, Workers
|
3
4
|
|
4
5
|
def queues
|
5
6
|
queues = SolidQueue::Queue.all
|
@@ -34,40 +35,26 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
34
35
|
find_queue_by_name(queue_name).paused?
|
35
36
|
end
|
36
37
|
|
37
|
-
def
|
38
|
-
|
38
|
+
def supported_job_statuses
|
39
|
+
SolidQueueJobs::STATUS_MAP.keys
|
39
40
|
end
|
40
41
|
|
41
|
-
def
|
42
|
+
def supported_job_filters(*)
|
42
43
|
[ :queue_name, :job_class_name ]
|
43
44
|
end
|
44
45
|
|
45
|
-
def exposes_workers?
|
46
|
-
true
|
47
|
-
end
|
48
|
-
|
49
|
-
def workers
|
50
|
-
SolidQueue::Process.where(kind: "Worker").collect do |process|
|
51
|
-
worker_attributes_from_solid_queue_process(process)
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
def find_worker(worker_id)
|
56
|
-
if process = SolidQueue::Process.find_by(id: worker_id)
|
57
|
-
worker_attributes_from_solid_queue_process(process)
|
58
|
-
end
|
59
|
-
end
|
60
|
-
|
61
46
|
def jobs_count(jobs_relation)
|
62
|
-
|
47
|
+
SolidQueueJobs.new(jobs_relation).count
|
63
48
|
end
|
64
49
|
|
65
50
|
def fetch_jobs(jobs_relation)
|
66
|
-
|
51
|
+
SolidQueueJobs.new(jobs_relation).jobs.map do |job|
|
52
|
+
deserialize_and_proxy_solid_queue_job(job, jobs_relation.status)
|
53
|
+
end
|
67
54
|
end
|
68
55
|
|
69
56
|
def retry_all_jobs(jobs_relation)
|
70
|
-
|
57
|
+
SolidQueueJobs.new(jobs_relation).retry_all
|
71
58
|
end
|
72
59
|
|
73
60
|
def retry_job(job, jobs_relation)
|
@@ -75,13 +62,17 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
75
62
|
end
|
76
63
|
|
77
64
|
def discard_all_jobs(jobs_relation)
|
78
|
-
|
65
|
+
SolidQueueJobs.new(jobs_relation).discard_all
|
79
66
|
end
|
80
67
|
|
81
68
|
def discard_job(job, jobs_relation)
|
82
69
|
find_solid_queue_job!(job.job_id, jobs_relation).discard
|
83
70
|
end
|
84
71
|
|
72
|
+
def dispatch_job(job, jobs_relation)
|
73
|
+
dispatch_immediately find_solid_queue_job!(job.job_id, jobs_relation)
|
74
|
+
end
|
75
|
+
|
85
76
|
def find_job(job_id, *)
|
86
77
|
if job = SolidQueue::Job.where(active_job_id: job_id).order(:id).last
|
87
78
|
deserialize_and_proxy_solid_queue_job job
|
@@ -93,27 +84,12 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
93
84
|
SolidQueue::Queue.find_by_name(queue_name)
|
94
85
|
end
|
95
86
|
|
96
|
-
def worker_attributes_from_solid_queue_process(process)
|
97
|
-
{
|
98
|
-
id: process.id,
|
99
|
-
name: "PID: #{process.pid}",
|
100
|
-
hostname: process.hostname,
|
101
|
-
last_heartbeat_at: process.last_heartbeat_at,
|
102
|
-
configuration: process.metadata,
|
103
|
-
raw_data: process.as_json
|
104
|
-
}
|
105
|
-
end
|
106
|
-
|
107
87
|
def find_solid_queue_job!(job_id, jobs_relation)
|
108
88
|
find_solid_queue_job(job_id, jobs_relation) or raise ActiveJob::Errors::JobNotFoundError.new(job_id, jobs_relation)
|
109
89
|
end
|
110
90
|
|
111
91
|
def find_solid_queue_job(job_id, jobs_relation)
|
112
|
-
|
113
|
-
end
|
114
|
-
|
115
|
-
def find_solid_queue_jobs_within(jobs_relation)
|
116
|
-
RelationAdapter.new(jobs_relation).jobs
|
92
|
+
SolidQueueJobs.new(jobs_relation).find_job(job_id)
|
117
93
|
end
|
118
94
|
|
119
95
|
def deserialize_and_proxy_solid_queue_job(solid_queue_job, job_status = nil)
|
@@ -134,7 +110,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
134
110
|
end
|
135
111
|
|
136
112
|
def status_from_solid_queue_job(solid_queue_job)
|
137
|
-
|
113
|
+
SolidQueueJobs::STATUS_MAP.invert[solid_queue_job.status]
|
138
114
|
end
|
139
115
|
|
140
116
|
def execution_error_from_solid_queue_job(solid_queue_job)
|
@@ -146,7 +122,14 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
146
122
|
end
|
147
123
|
end
|
148
124
|
|
149
|
-
|
125
|
+
def dispatch_immediately(job)
|
126
|
+
SolidQueue::Job.transaction do
|
127
|
+
job.dispatch_bypassing_concurrency_limits
|
128
|
+
job.blocked_execution.destroy!
|
129
|
+
end
|
130
|
+
end
|
131
|
+
|
132
|
+
class SolidQueueJobs
|
150
133
|
STATUS_MAP = {
|
151
134
|
pending: :ready,
|
152
135
|
failed: :failed,
|
@@ -161,7 +144,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
161
144
|
end
|
162
145
|
|
163
146
|
def jobs
|
164
|
-
solid_queue_status.finished? ? order_finished_jobs(finished_jobs) : order_executions(executions).map(&:job)
|
147
|
+
solid_queue_status.finished? ? order_finished_jobs(finished_jobs) : order_executions(executions).map(&:job).compact
|
165
148
|
end
|
166
149
|
|
167
150
|
def count
|
@@ -169,7 +152,7 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
169
152
|
end
|
170
153
|
|
171
154
|
def find_job(active_job_id)
|
172
|
-
if job = SolidQueue::Job.
|
155
|
+
if job = SolidQueue::Job.where(active_job_id: active_job_id).order(:id).last
|
173
156
|
job if matches_relation_filters?(job)
|
174
157
|
end
|
175
158
|
end
|
@@ -185,13 +168,16 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
185
168
|
private
|
186
169
|
attr_reader :jobs_relation
|
187
170
|
|
188
|
-
delegate :queue_name, :limit_value, :limit_value_provided?, :offset_value, :job_class_name,
|
171
|
+
delegate :queue_name, :limit_value, :limit_value_provided?, :offset_value, :job_class_name,
|
172
|
+
:default_page_size, :worker_id, :recurring_task_id, to: :jobs_relation
|
189
173
|
|
190
174
|
def executions
|
191
|
-
execution_class_by_status
|
175
|
+
execution_class_by_status
|
176
|
+
.then { |executions| include_execution_association(executions) }
|
192
177
|
.then { |executions| filter_executions_by_queue(executions) }
|
193
178
|
.then { |executions| filter_executions_by_class(executions) }
|
194
179
|
.then { |executions| filter_executions_by_process_id(executions) }
|
180
|
+
.then { |executions| filter_executions_by_task_key(executions) }
|
195
181
|
.then { |executions| limit(executions) }
|
196
182
|
.then { |executions| offset(executions) }
|
197
183
|
end
|
@@ -209,10 +195,11 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
209
195
|
end
|
210
196
|
|
211
197
|
def order_executions(executions)
|
212
|
-
|
213
|
-
|
214
|
-
|
215
|
-
|
198
|
+
case
|
199
|
+
# Follow polling order for scheduled executions, the rest by job_id, desc or asc
|
200
|
+
when solid_queue_status.scheduled? then executions.ordered
|
201
|
+
when recurring_task_id.present? then executions.order(job_id: :desc)
|
202
|
+
else executions.order(job_id: :asc)
|
216
203
|
end
|
217
204
|
end
|
218
205
|
|
@@ -224,21 +211,26 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
224
211
|
solid_queue_status.finished? ? finished_jobs.count : executions.count
|
225
212
|
end
|
226
213
|
|
227
|
-
INTERNAL_COUNT_LIMIT = 500_000 # Hard limit to keep unlimited count queries fast enough
|
228
|
-
|
229
214
|
def internally_limited_count
|
230
|
-
|
231
|
-
|
215
|
+
count_limit = MissionControl::Jobs.internal_query_count_limit + 1
|
216
|
+
limited_count = solid_queue_status.finished? ? finished_jobs.limit(count_limit).count : executions.limit(count_limit).count
|
217
|
+
(limited_count == count_limit) ? Float::INFINITY : limited_count
|
232
218
|
end
|
233
219
|
|
234
220
|
def execution_class_by_status
|
235
|
-
if
|
221
|
+
if recurring_task_id.present?
|
222
|
+
SolidQueue::RecurringExecution
|
223
|
+
elsif solid_queue_status.present? && !solid_queue_status.finished?
|
236
224
|
"SolidQueue::#{solid_queue_status.capitalize}Execution".safe_constantize
|
237
225
|
else
|
238
226
|
raise ActiveJob::Errors::QueryError, "Status not supported: #{jobs_relation.status}"
|
239
227
|
end
|
240
228
|
end
|
241
229
|
|
230
|
+
def include_execution_association(executions)
|
231
|
+
solid_queue_status.present? ? executions.includes(job: "#{solid_queue_status}_execution") : executions.includes(:job)
|
232
|
+
end
|
233
|
+
|
242
234
|
def filter_executions_by_queue(executions)
|
243
235
|
return executions unless queue_name.present?
|
244
236
|
|
@@ -263,10 +255,14 @@ module ActiveJob::QueueAdapters::SolidQueueExt
|
|
263
255
|
if solid_queue_status.claimed?
|
264
256
|
executions.where(process_id: worker_id)
|
265
257
|
else
|
266
|
-
raise ActiveJob::Errors::QueryError, "Filtering by worker
|
258
|
+
raise ActiveJob::Errors::QueryError, "Filtering by worker id is not supported for status #{jobs_relation.status}"
|
267
259
|
end
|
268
260
|
end
|
269
261
|
|
262
|
+
def filter_executions_by_task_key(executions)
|
263
|
+
recurring_task_id.present? ? executions.where(task_key: recurring_task_id) : executions
|
264
|
+
end
|
265
|
+
|
270
266
|
def filter_jobs_by_class(jobs)
|
271
267
|
job_class_name.present? ? jobs.where(class_name: job_class_name) : jobs
|
272
268
|
end
|