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).
69 lines
1.6 KiB
Go
69 lines
1.6 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package job
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
defaultPluginId = "pi_system"
|
|
)
|
|
|
|
// getOpts - iterate the inbound Options and return a struct
|
|
func getOpts(opt ...Option) options {
|
|
opts := getDefaultOptions()
|
|
for _, o := range opt {
|
|
o(&opts)
|
|
}
|
|
return opts
|
|
}
|
|
|
|
// Option - how Options are passed as arguments
|
|
type Option func(*options)
|
|
|
|
// options = how options are represented
|
|
type options struct {
|
|
withNextRunIn time.Duration
|
|
withLimit int
|
|
withName string
|
|
withControllerId string
|
|
}
|
|
|
|
func getDefaultOptions() options {
|
|
return options{} // No default options.
|
|
}
|
|
|
|
// WithNextRunIn provides an option to provide the duration until the next run is scheduled.
|
|
// If this option is not provided the NextScheduledRun of the job will default to the
|
|
// current database time, and be available to run immediately.
|
|
func WithNextRunIn(d time.Duration) Option {
|
|
return func(o *options) {
|
|
o.withNextRunIn = d
|
|
}
|
|
}
|
|
|
|
// WithLimit provides an option to provide a limit for ListJobs. Intentionally
|
|
// allowing negative integers. If WithLimit < 0, then unlimited results are
|
|
// returned. If WithLimit == 0, then default limits are used for results.
|
|
func WithLimit(l int) Option {
|
|
return func(o *options) {
|
|
o.withLimit = l
|
|
}
|
|
}
|
|
|
|
// WithName provides an option to provide the name to match when calling ListJobs
|
|
func WithName(n string) Option {
|
|
return func(o *options) {
|
|
o.withName = n
|
|
}
|
|
}
|
|
|
|
// WithControllerId provides an option to provide the server id to match when calling InterruptRuns
|
|
func WithControllerId(id string) Option {
|
|
return func(o *options) {
|
|
o.withControllerId = id
|
|
}
|
|
}
|