Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/ci/register_job_service.rb')
-rw-r--r--app/services/ci/register_job_service.rb16
1 files changed, 7 insertions, 9 deletions
diff --git a/app/services/ci/register_job_service.rb b/app/services/ci/register_job_service.rb
index 6c9044b5089..8969b95b81f 100644
--- a/app/services/ci/register_job_service.rb
+++ b/app/services/ci/register_job_service.rb
@@ -157,15 +157,13 @@ module Ci
unless build.pending?
@metrics.increment_queue_operation(:build_not_pending)
- if Feature.enabled?(:ci_pending_builds_table_resiliency, default_enabled: :yaml)
- ##
- # If this build can not be picked because we had stale data in
- # `ci_pending_builds` table, we need to respond with 409 to retry
- # this operation.
- #
- if ::Ci::UpdateBuildQueueService.new.remove!(build)
- return Result.new(nil, nil, false)
- end
+ ##
+ # If this build can not be picked because we had stale data in
+ # `ci_pending_builds` table, we need to respond with 409 to retry
+ # this operation.
+ #
+ if ::Ci::UpdateBuildQueueService.new.remove!(build)
+ return Result.new(nil, nil, false)
end
return