Skip to content

Commit 5564f51

Browse files
Merge pull request #2257 from coreinfrastructure/solid_queue
Add solid_queue as active_jobs backend
2 parents 3e001d8 + dc5430e commit 5564f51

File tree

10 files changed

+329
-3
lines changed

10 files changed

+329
-3
lines changed

Gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ gem 'redcarpet', '~> 3.5' # Process markdown in form textareas (justifications)
100100
gem 'sassc-rails' # compiles .scss (css replacement) drop-in replacement for sass-rails
101101
gem 'scout_apm' # Monitor for memory leaks
102102
gem 'secure_headers', '~> 7' # Add hardening measures to HTTP headers
103+
gem 'solid_queue', '~> 1.1' # ActiveJob database backend
103104
# WARNING!!!!
104105
# CHECK DEPLOYMENT FIRST IF YOU UPDATE sprockets-rails.
105106
# The gem sprockets-rails version 3.4.1 (from 3.2.2) caused a regression

Gemfile.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ GEM
146146
execjs
147147
multi_json (>= 1.3)
148148
rake
149+
et-orbi (1.2.11)
150+
tzinfo
149151
execjs (2.10.0)
150152
faraday (2.12.2)
151153
faraday-net_http (>= 2.0, < 3.5)
@@ -169,6 +171,9 @@ GEM
169171
nokogiri (>= 1.11.3)
170172
railties (>= 4.2)
171173
forwardable (1.3.3)
174+
fugit (1.11.1)
175+
et-orbi (~> 1, >= 1.2.11)
176+
raabro (~> 1.4)
172177
get_process_mem (1.0.0)
173178
bigdecimal (>= 2.0)
174179
ffi (~> 1.0)
@@ -359,6 +364,7 @@ GEM
359364
bigdecimal (>= 2.0)
360365
get_process_mem (>= 0.2)
361366
puma (>= 2.7)
367+
raabro (1.4.0)
362368
racc (1.8.1)
363369
rack (2.2.10)
364370
rack-attack (6.7.0)
@@ -501,6 +507,13 @@ GEM
501507
snaky_hash (2.0.1)
502508
hashie
503509
version_gem (~> 1.1, >= 1.1.1)
510+
solid_queue (1.1.2)
511+
activejob (>= 7.1)
512+
activerecord (>= 7.1)
513+
concurrent-ruby (>= 1.3.1)
514+
fugit (~> 1.11.0)
515+
railties (>= 7.1)
516+
thor (~> 1.3.1)
504517
spring (4.2.1)
505518
sprockets (4.2.1)
506519
concurrent-ruby (~> 1.0)
@@ -641,6 +654,7 @@ DEPENDENCIES
641654
selenium-webdriver
642655
sentry-rails
643656
sentry-ruby
657+
solid_queue (~> 1.1)
644658
spring (~> 4.1)
645659
sprockets-rails (= 3.5.2)
646660
translation (= 1.41)

bin/jobs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env ruby
2+
3+
require_relative "../config/environment"
4+
require "solid_queue/cli"
5+
6+
SolidQueue::Cli.start(ARGV)

config/environments/production.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,5 +239,12 @@
239239
# Do nothing if it's unavailable (this happens if we didn't load the gem)
240240
end
241241
# rubocop:enable Lint/HandleExceptions
242+
243+
# Configure active_job to use solid_queue as its back end when in production.
244+
config.active_job.queue_adapter = :solid_queue
245+
# We intentionally use *one* database for both the jobs and everythihg else.
246+
# This greatly simplifies backup, maintenance, etc. If you wanted the
247+
# jobs to go into their own database, you'd need to do something like:
248+
# config.solid_queue.connects_to = { database: { writing: :queue } }
242249
end
243250
# rubocop:enable Metrics/BlockLength

config/puma.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,11 @@
5454
# Allow puma to be restarted by `rails restart` command.
5555
plugin :tmp_restart
5656

57+
# Use solid_queue as the ActiveJob backend. This stores jobs in a database,
58+
# so scheduled jobs will happen even if the system crashes.
59+
# Set the environment variable if you want it activated (e.g., in production)
60+
plugin :solid_queue if ENV['SOLID_QUEUE_IN_PUMA'] # || Rails.env.development?
61+
5762
# Use puma_worker_killer to occasionally restart.
5863
# This is a band-aid to counter memory growth.
5964
# There's a performance hit (restart time + cache loss), but it

config/queue.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
default: &default
2+
dispatchers:
3+
- polling_interval: 1
4+
batch_size: 100
5+
workers:
6+
- queues: "*"
7+
threads: 2
8+
processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %>
9+
polling_interval: 0.5
10+
11+
development:
12+
<<: *default
13+
14+
test:
15+
<<: *default
16+
17+
production:
18+
<<: *default

config/recurring.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# production:
2+
# periodic_cleanup:
3+
# class: CleanSoftDeletedRecordsJob
4+
# queue: background
5+
# args: [ 1000, { batch_size: 500 } ]
6+
# schedule: every hour
7+
# periodic_command:
8+
# command: "SoftDeletedRecord.due.delete_all"
9+
# priority: 2
10+
# schedule: at 5am every day
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# frozen_string_literal: true
2+
# Generated by solid_queue.
3+
4+
class SolidQueue < ActiveRecord::Migration[8.0]
5+
def change
6+
create_table "solid_queue_blocked_executions", force: :cascade do |t|
7+
t.bigint "job_id", null: false
8+
t.string "queue_name", null: false
9+
t.integer "priority", default: 0, null: false
10+
t.string "concurrency_key", null: false
11+
t.datetime "expires_at", null: false
12+
t.datetime "created_at", null: false
13+
t.index [ "concurrency_key", "priority", "job_id" ], name: "index_solid_queue_blocked_executions_for_release"
14+
t.index [ "expires_at", "concurrency_key" ], name: "index_solid_queue_blocked_executions_for_maintenance"
15+
t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
16+
end
17+
18+
create_table "solid_queue_claimed_executions", force: :cascade do |t|
19+
t.bigint "job_id", null: false
20+
t.bigint "process_id"
21+
t.datetime "created_at", null: false
22+
t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
23+
t.index [ "process_id", "job_id" ], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
24+
end
25+
26+
create_table "solid_queue_failed_executions", force: :cascade do |t|
27+
t.bigint "job_id", null: false
28+
t.text "error"
29+
t.datetime "created_at", null: false
30+
t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true
31+
end
32+
33+
create_table "solid_queue_jobs", force: :cascade do |t|
34+
t.string "queue_name", null: false
35+
t.string "class_name", null: false
36+
t.text "arguments"
37+
t.integer "priority", default: 0, null: false
38+
t.string "active_job_id"
39+
t.datetime "scheduled_at"
40+
t.datetime "finished_at"
41+
t.string "concurrency_key"
42+
t.datetime "created_at", null: false
43+
t.datetime "updated_at", null: false
44+
t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id"
45+
t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name"
46+
t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at"
47+
t.index [ "queue_name", "finished_at" ], name: "index_solid_queue_jobs_for_filtering"
48+
t.index [ "scheduled_at", "finished_at" ], name: "index_solid_queue_jobs_for_alerting"
49+
end
50+
51+
create_table "solid_queue_pauses", force: :cascade do |t|
52+
t.string "queue_name", null: false
53+
t.datetime "created_at", null: false
54+
t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true
55+
end
56+
57+
create_table "solid_queue_processes", force: :cascade do |t|
58+
t.string "kind", null: false
59+
t.datetime "last_heartbeat_at", null: false
60+
t.bigint "supervisor_id"
61+
t.integer "pid", null: false
62+
t.string "hostname"
63+
t.text "metadata"
64+
t.datetime "created_at", null: false
65+
t.string "name", null: false
66+
t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at"
67+
t.index [ "name", "supervisor_id" ], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
68+
t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id"
69+
end
70+
71+
create_table "solid_queue_ready_executions", force: :cascade do |t|
72+
t.bigint "job_id", null: false
73+
t.string "queue_name", null: false
74+
t.integer "priority", default: 0, null: false
75+
t.datetime "created_at", null: false
76+
t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true
77+
t.index [ "priority", "job_id" ], name: "index_solid_queue_poll_all"
78+
t.index [ "queue_name", "priority", "job_id" ], name: "index_solid_queue_poll_by_queue"
79+
end
80+
81+
create_table "solid_queue_recurring_executions", force: :cascade do |t|
82+
t.bigint "job_id", null: false
83+
t.string "task_key", null: false
84+
t.datetime "run_at", null: false
85+
t.datetime "created_at", null: false
86+
t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
87+
t.index [ "task_key", "run_at" ], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
88+
end
89+
90+
create_table "solid_queue_recurring_tasks", force: :cascade do |t|
91+
t.string "key", null: false
92+
t.string "schedule", null: false
93+
t.string "command", limit: 2048
94+
t.string "class_name"
95+
t.text "arguments"
96+
t.string "queue_name"
97+
t.integer "priority", default: 0
98+
t.boolean "static", default: true, null: false
99+
t.text "description"
100+
t.datetime "created_at", null: false
101+
t.datetime "updated_at", null: false
102+
t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true
103+
t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static"
104+
end
105+
106+
create_table "solid_queue_scheduled_executions", force: :cascade do |t|
107+
t.bigint "job_id", null: false
108+
t.string "queue_name", null: false
109+
t.integer "priority", default: 0, null: false
110+
t.datetime "scheduled_at", null: false
111+
t.datetime "created_at", null: false
112+
t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
113+
t.index [ "scheduled_at", "priority", "job_id" ], name: "index_solid_queue_dispatch_all"
114+
end
115+
116+
create_table "solid_queue_semaphores", force: :cascade do |t|
117+
t.string "key", null: false
118+
t.integer "value", default: 1, null: false
119+
t.datetime "expires_at", null: false
120+
t.datetime "created_at", null: false
121+
t.datetime "updated_at", null: false
122+
t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at"
123+
t.index [ "key", "value" ], name: "index_solid_queue_semaphores_on_key_and_value"
124+
t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true
125+
end
126+
127+
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
128+
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
129+
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
130+
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
131+
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
132+
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
133+
end
134+
end

0 commit comments

Comments
 (0)