Hugo
f227020b67
This commit changes the logic around selecting jobs to run. Before this, Boundary used a view "job_jobs_to_run" which was a collation of all jobs that were not running and scheduled to run. When jobs were requested to run, Boundary would look at this view, grab a certain amount of jobs and insert them into the "job_run" table. Importantly, while the amount of jobs to be scheduled at once defaulted to 1 in the scheduler package, this was entirely overriden in the controller package to -1 (no limit, run all jobs that the query would return). With this commit, Boundary now looks at the "job" table directly for jobs to run, regardless of job run status. This was done to improve DB performance as the view (which queried all "job_run" rows) was causing significant DB contention. Additionally, the option to limit job runs is now removed since it was already hardcoded to -1 and not user-configurable anyways. Should the need arise to implement this limit again, this will have to be done in a different way since the new query does not account for running jobs and limiting the rows returned after jobs are already running would yield a no-op (the new query inserts nothing into "job_run" if any given job is already running).
118 lines
1.9 KiB
Go
118 lines
1.9 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package job
|
|
|
|
const runJobsQuery = `
|
|
insert into job_run (
|
|
job_plugin_id, job_name, controller_id
|
|
)
|
|
select
|
|
j.plugin_id, j."name", ?
|
|
from job j
|
|
where next_scheduled_run <= current_timestamp
|
|
order by next_scheduled_run asc
|
|
on conflict
|
|
(job_plugin_id, job_name)
|
|
where status = 'running'
|
|
do nothing
|
|
returning *;
|
|
`
|
|
|
|
const upsertJobQuery = `
|
|
insert into job (
|
|
plugin_id,
|
|
name,
|
|
description,
|
|
next_scheduled_run
|
|
) values (
|
|
@plugin_id, -- plugin_id
|
|
@name, -- name
|
|
@description, -- description
|
|
wt_add_seconds_to_now(@next_scheduled_run) -- next_scheduled_run
|
|
)
|
|
on conflict on constraint
|
|
job_pkey
|
|
do update set
|
|
description = @description
|
|
returning *;
|
|
`
|
|
|
|
const setNextScheduledRunIfSoonerQuery = `
|
|
update
|
|
job
|
|
set
|
|
next_scheduled_run = least(wt_add_seconds_to_now(?), next_scheduled_run)
|
|
where
|
|
plugin_id = ?
|
|
and name = ?
|
|
returning *;
|
|
`
|
|
|
|
const setNextScheduledRunQuery = `
|
|
update
|
|
job
|
|
set
|
|
next_scheduled_run = wt_add_seconds_to_now(?)
|
|
where
|
|
plugin_id = ?
|
|
and name = ?
|
|
returning *;
|
|
`
|
|
|
|
const updateProgressQuery = `
|
|
update
|
|
job_run
|
|
set
|
|
completed_count = ?,
|
|
total_count = ?,
|
|
retries_count = ?
|
|
where
|
|
private_id = ?
|
|
and status = 'running'
|
|
returning *;
|
|
`
|
|
|
|
const completeRunQuery = `
|
|
delete from job_run
|
|
where
|
|
private_id = ?
|
|
and status = 'running'
|
|
returning *;
|
|
`
|
|
|
|
const failRunQuery = `
|
|
update
|
|
job_run
|
|
set
|
|
completed_count = ?,
|
|
total_count = ?,
|
|
retries_count = ?,
|
|
status = 'failed',
|
|
end_time = current_timestamp
|
|
where
|
|
private_id = ?
|
|
and status = 'running'
|
|
returning *;
|
|
`
|
|
|
|
const interruptRunsQuery = `
|
|
update
|
|
job_run
|
|
set
|
|
status = 'interrupted',
|
|
end_time = current_timestamp
|
|
where
|
|
update_time <= wt_add_seconds_to_now(?)
|
|
and status = 'running'
|
|
%s
|
|
returning *;
|
|
`
|
|
|
|
const deleteJobByName = `
|
|
delete
|
|
from job
|
|
where
|
|
name = ?
|
|
`
|