Skip to content

Commit

Permalink
remove not reachable code
Browse files Browse the repository at this point in the history
  • Loading branch information
ankithads committed Sep 4, 2024
1 parent 7d136d8 commit 6a5a5ff
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 13 deletions.
26 changes: 13 additions & 13 deletions lib/que/adapters/active_record_with_lock.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@
module Que
module Adapters
class ActiveRecordWithLock < Que::Adapters::ActiveRecord
class NoLockableJobs < StandardError; end
FindJobSecondsTotal = Prometheus::Client::Counter.new(
:que_find_job_seconds_total,
docstring: "Seconds spent finding a job",
labels: %i[queue],
)
METRICS = [
FindJobSecondsTotal = Prometheus::Client::Counter.new(
:que_find_job_seconds_total,
docstring: "Seconds spent finding a job",
labels: %i[queue],
),

FindJobHitTotal = Prometheus::Client::Counter.new(
:que_find_job_total,
docstring: "total number of job hit and misses when acquiring a lock",
labels: %i[queue job_hit],
)
FindJobHitTotal = Prometheus::Client::Counter.new(
:que_find_job_hit_total,
docstring: "total number of job hit and misses when acquiring a lock",
labels: %i[queue job_hit],
),
].freeze

def initialize(job_connection_pool:, lock_connection_pool:)
@job_connection_pool = job_connection_pool
Expand Down Expand Up @@ -50,7 +51,7 @@ def execute(command, params = [])
def lock_job_with_lock_database(queue, cursor)
loop do
observe(duration_metric: FindJobSecondsTotal, labels: { queue: queue }) do
locked_job = Que.transaction do
Que.transaction do
job_to_lock = Que.execute(:find_job_to_lock, [queue, cursor])

return job_to_lock if job_to_lock.empty?
Expand All @@ -61,7 +62,6 @@ def lock_job_with_lock_database(queue, cursor)
observe(count_metric: FindJobHitTotal, labels: { queue: queue, job_hit: job_locked })
return job_to_lock if job_locked
end
return locked_job if locked_job
end
end
end
Expand Down
1 change: 1 addition & 0 deletions lib/que/middleware/worker_collector.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def initialize(app, options = {})
register(*WorkerGroup::METRICS)
register(*Worker::METRICS)
register(*Locker::METRICS)
register(*Adapters::ActiveRecordWithLock::METRICS)
end

def call(env)
Expand Down
3 changes: 3 additions & 0 deletions spec/lib/que/adapters/active_record_with_lock_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,10 @@
end

it "sets correct metric values" do
expect(QueJob.count).to eq(10)
puts QueJob.all.pluck(:queue, :run_at)
with_workers(5) { wait_for_jobs_to_be_worked }
expect(QueJob.count).to eq(0)
expect(described_class::FindJobHitTotal.values[{ :queue => "default", :job_hit => "true" }]).to eq(10.0)
end
end
Expand Down

0 comments on commit 6a5a5ff

Please sign in to comment.