diff options
Diffstat (limited to 'lib/gitlab/ci/pipeline/chain')
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/command.rb | 12 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/limit/active_jobs.rb | 3 | ||||
| -rw-r--r-- | lib/gitlab/ci/pipeline/chain/limit/job_activity.rb | 23 |
3 files changed, 1 insertions, 37 deletions
diff --git a/lib/gitlab/ci/pipeline/chain/command.rb b/lib/gitlab/ci/pipeline/chain/command.rb index 4b7507b11a7..76d4a05bf30 100644 --- a/lib/gitlab/ci/pipeline/chain/command.rb +++ b/lib/gitlab/ci/pipeline/chain/command.rb @@ -121,11 +121,7 @@ module Gitlab end def observe_jobs_count_in_alive_pipelines - jobs_count = if limit_active_jobs_early? - project.all_pipelines.jobs_count_in_alive_pipelines - else - project.all_pipelines.builds_count_in_alive_pipelines - end + jobs_count = project.all_pipelines.jobs_count_in_alive_pipelines metrics.active_jobs_histogram .observe({ plan: project.actual_plan_name }, jobs_count) @@ -136,12 +132,6 @@ module Gitlab .increment(reason: (reason || :unknown_failure).to_s) end - def limit_active_jobs_early? - strong_memoize(:limit_active_jobs_early) do - Feature.enabled?(:ci_limit_active_jobs_early, project) - end - end - private # Verifies that origin_ref is a fully qualified tag reference (refs/tags/<tag-name>) diff --git a/lib/gitlab/ci/pipeline/chain/limit/active_jobs.rb b/lib/gitlab/ci/pipeline/chain/limit/active_jobs.rb index cbd895b05a5..8b26416edf7 100644 --- a/lib/gitlab/ci/pipeline/chain/limit/active_jobs.rb +++ b/lib/gitlab/ci/pipeline/chain/limit/active_jobs.rb @@ -13,7 +13,6 @@ module Gitlab MESSAGE = "Project exceeded the allowed number of jobs in active pipelines. Retry later." def perform! - return unless command.limit_active_jobs_early? return unless limits.exceeded?(LIMIT_NAME, count_jobs_in_alive_pipelines) error(MESSAGE, drop_reason: :job_activity_limit_exceeded) @@ -26,8 +25,6 @@ module Gitlab end def break? - return unless command.limit_active_jobs_early? - pipeline.errors.any? end diff --git a/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb b/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb deleted file mode 100644 index 3706dd0b9f6..00000000000 --- a/lib/gitlab/ci/pipeline/chain/limit/job_activity.rb +++ /dev/null @@ -1,23 +0,0 @@ -# frozen_string_literal: true - -module Gitlab - module Ci - module Pipeline - module Chain - module Limit - class JobActivity < Chain::Base - def perform! - # to be overridden in EE - end - - def break? - false # to be overridden in EE - end - end - end - end - end - end -end - -Gitlab::Ci::Pipeline::Chain::Limit::JobActivity.prepend_mod_with('Gitlab::Ci::Pipeline::Chain::Limit::JobActivity') |