diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 13:37:47 +0000 |
| commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
| tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/services/ci/stuck_builds/drop_pending_service.rb | |
| parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) | |
| download | gitlab-ce-aee0a117a889461ce8ced6fcf73207fe017f1d99.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/services/ci/stuck_builds/drop_pending_service.rb')
| -rw-r--r-- | app/services/ci/stuck_builds/drop_pending_service.rb | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/services/ci/stuck_builds/drop_pending_service.rb b/app/services/ci/stuck_builds/drop_pending_service.rb index 4653e701973..dddd1cfb781 100644 --- a/app/services/ci/stuck_builds/drop_pending_service.rb +++ b/app/services/ci/stuck_builds/drop_pending_service.rb @@ -7,7 +7,6 @@ module Ci BUILD_PENDING_OUTDATED_TIMEOUT = 1.day BUILD_PENDING_STUCK_TIMEOUT = 1.hour - BUILD_LOOKBACK = 5.days def execute Gitlab::AppLogger.info "#{self.class}: Cleaning pending timed-out builds" @@ -30,11 +29,11 @@ module Ci # because we want to force the query planner to use the # `ci_builds_gitlab_monitor_metrics` index all the time. def pending_builds(timeout) - if Feature.enabled?(:ci_new_query_for_pending_stuck_jobs) - Ci::Build.pending.created_at_before(timeout).updated_at_before(timeout).order(created_at: :asc, project_id: :asc) - else - Ci::Build.pending.updated_before(lookback: BUILD_LOOKBACK.ago, timeout: timeout) - end + Ci::Build + .pending + .created_at_before(timeout) + .updated_at_before(timeout) + .order(created_at: :asc, project_id: :asc) end # rubocop: enable CodeReuse/ActiveRecord end |